Merge pull request #89 from MrClock8163/fixes

v2.5.1

Author: MrClock8163

Arma3ObjectBuilder/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [v2.5.1](https://github.com/MrClock8163/Arma3ObjectBuilder/releases/tag/v2.5.1) (Blender 2.90 -> 4.4)
+
+### Fixed
+
+- Face and vertex flag groups were not properly handled in some cases
+- The disabled "Preserve Preprocessed LOD Objects" option was not respected if an error occured during export
+
 ## [v2.5.0](https://github.com/MrClock8163/Arma3ObjectBuilder/releases/tag/v2.5.0) (Blender 2.90 -> 4.3)
 
 ### Added

Arma3ObjectBuilder/__init__.py

@@ -2,10 +2,10 @@
     "name": "Arma 3 Object Builder",
     "description": "Collection of tools for editing Arma 3 content",
     "author": "MrClock (present add-on), Hans-Joerg \"Alwarren\" Frieden (original ArmaToolbox add-on)",
-    "version": (2, 5, 0),
+    "version": (2, 5, 1),
     "blender": (2, 90, 0),
     "location": "Object Builder panels",
-    "warning": "",
+    "warning": "Development",
     "doc_url": "https://mrcmodding.gitbook.io/arma-3-object-builder/home",
     "tracker_url": "https://github.com/MrClock8163/Arma3ObjectBuilder/issues",
     "category": "Import-Export"

Arma3ObjectBuilder/blender_manifest.toml

@@ -5,7 +5,7 @@ type = "add-on"
 id = "Arma3ObjectBuilder"
 name = "Arma 3 Object Builder"
 tagline = "Comprehensive add-on for modding Arma 3"
-version = "2.5.0"
+version = "2.5.1"
 blender_version_min = "4.2.0"
 website = "https://mrcmodding.gitbook.io/arma-3-object-builder/home"
 tags = ["Import-Export", "Game Engine", "Object"]

Arma3ObjectBuilder/io/export_p3d.py

@@ -105,32 +105,32 @@ def bake_flags_vertex(obj):
     with utils.edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
 
-        default_flag = get_prefs().flag_vertex
-
         layer = flagutils.get_layer_flags_vertex(bm)
         flags_vertex = {i: item.get_flag() for i, item in enumerate(obj.a3ob_properties_object_flags.vertex)}
-        if len(flags_vertex) > 0:
+        if len(flags_vertex) == 0:
+            default_flag = get_prefs().flag_vertex
             for vert in bm.verts:
-                vert[layer] = flags_vertex.get(vert[layer], default_flag)
+                vert[layer] = default_flag
         else:
+            flag = flags_vertex[0]
             for vert in bm.verts:
-                vert[layer] = default_flag
+                vert[layer] = flags_vertex.get(vert[layer], flag)
 
 
 def bake_flags_face(obj):
     with utils.edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
 
-        default_flag = get_prefs().flag_face
-
         layer = flagutils.get_layer_flags_face(bm)
         flags_face = {i: item.get_flag() for i, item in enumerate(obj.a3ob_properties_object_flags.face)}
-        if len(flags_face) > 0:
+        if len(flags_face) == 0:
+            default_flag = get_prefs().flag_face
             for face in bm.faces:
-                face[layer] = flags_face.get(face[layer], default_flag)
+                face[layer] = default_flag
         else:
+            flag = flags_face[0]
             for face in bm.faces:
-                face[layer] = default_flag
+                face[layer] = flags_face.get(face[layer], flag)
 
 
 def blank_flags_vertex(obj):

Arma3ObjectBuilder/ui/import_export_p3d.py

@@ -325,14 +325,18 @@ def execute(self, context):
         temp_collection = export_p3d.create_temp_collection(context)
 
         with utils.ExportFileHandler(self.filepath, "wb") as file:
-            lod_count, exported_count = export_p3d.write_file(self, context, file, temp_collection)
-            if lod_count == exported_count:
-                utils.op_report(self, {'INFO'}, "Successfully exported all %d LODs (check the logs in the system console)" % exported_count)
-            else:
-                utils.op_report(self, {'WARNING'}, "Only exported %d/%d LODs (check the logs in the system console)" % (exported_count, lod_count))
-        
-        if not get_prefs().preserve_preprocessed_lods:
-            export_p3d.cleanup_temp_collection(temp_collection)            
+            # The export needs to be put inside a try-catch block in order to do the temporary object cleanup.
+            try:
+                lod_count, exported_count = export_p3d.write_file(self, context, file, temp_collection)
+
+                if lod_count == exported_count:
+                    utils.op_report(self, {'INFO'}, "Successfully exported all %d LODs (check the logs in the system console)" % exported_count)
+                else:
+                    utils.op_report(self, {'WARNING'}, "Only exported %d/%d LODs (check the logs in the system console)" % (exported_count, lod_count))
+
+            finally:
+                if not get_prefs().preserve_preprocessed_lods:
+                    export_p3d.cleanup_temp_collection(temp_collection) 
 
         return {'FINISHED'}
 

Arma3ObjectBuilder/utilities/flags.py

@@ -138,13 +138,14 @@ def assign_group_vertex(obj, group_id):
 
 
 def select_group_vertex(obj, group_id, select = True):
+    group_count = len(obj.a3ob_properties_object_flags.vertex)
     with utils.edit_bmesh(obj) as bm:
         bm.verts.ensure_lookup_table()
 
         layer = get_layer_flags_vertex(bm)
-        
         for vertex in bm.verts:
-            if vertex[layer] == group_id:
+            value = vertex[layer]
+            if value == group_id or (group_id == 0 and not (0 <= value < group_count)):
                 vertex.select = select
 
 
@@ -178,13 +179,14 @@ def assign_group_face(obj, group_id):
 
 
 def select_group_face(obj, group_id, select = True):
+    group_count = len(obj.a3ob_properties_object_flags.face)
     with utils.edit_bmesh(obj) as bm:
         bm.faces.ensure_lookup_table()
 
         layer = get_layer_flags_face(bm)
-        
         for face in bm.faces:
-            if face[layer] == group_id:
+            value = face[layer]
+            if value == group_id or (group_id == 0 and not (0 <= value < group_count)):
                 face.select = select