Merge pull request #62 from MrClock8163/dev

v2.3.3

Author: MrClock8163

Arma3ObjectBuilder/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v2.3.3](https://github.com/MrClock8163/Arma3ObjectBuilder/releases/tag/v2.3.3) (Blender 2.90 -> 4.1)
+
+### Fixed
+
+- Extract Proxy would fail due to missing internal property
+
 ## [v2.3.2](https://github.com/MrClock8163/Arma3ObjectBuilder/releases/tag/v2.3.2) (Blender 2.90 -> 4.1)
 
 ### 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, 3, 2),
+    "version": (2, 3, 3),
     "blender": (2, 90, 0),
     "location": "Object Builder panels",
-    "warning": "Development",
+    "warning": "",
     "doc_url": "https://mrcmodding.gitbook.io/arma-3-object-builder/home",
     "tracker_url": "https://github.com/MrClock8163/Arma3ObjectBuilder/issues",
     "category": "3D View"

Arma3ObjectBuilder/ui/tool_proxies.py

@@ -118,6 +118,7 @@ class A3OB_OT_proxy_extract(bpy.types.Operator):
     first_lod_only: bpy.props.BoolProperty(default=True)
     translate_selections: bpy.props.BoolProperty()
     cleanup_empty_selections: bpy.props.BoolProperty()
+    sections: bpy.props.EnumProperty(items=(("PRESERVE", "", ""),), default="PRESERVE")
     absolute_paths: bpy.props.BoolProperty(default=True)
     filepath: bpy.props.StringProperty()
 
@@ -136,6 +137,11 @@ def execute(self, context):
         with open(self.filepath, "rb") as file:
             try:
                 lod_objects = import_p3d.read_file(self, context, file)
+                imported_object = lod_objects[0]
+                imported_object.matrix_world = proxy_object.matrix_world
+                imported_object.name = os.path.basename(self.filepath)
+                imported_object.data.name = os.path.basename(self.filepath)
+                bpy.data.meshes.remove(proxy_object.data)
                 self.report({'INFO'}, "Successfully extracted proxy (check the logs in the system console)")
             except struct.error as ex:
                 self.report({'ERROR'}, "Unexpected EndOfFile (check the system console)")
@@ -144,12 +150,6 @@ def execute(self, context):
                 self.report({'ERROR'}, "%s (check the system console)" % ex)
                 traceback.print_exc()
 
-        imported_object = lod_objects[0]
-        imported_object.matrix_world = proxy_object.matrix_world
-        imported_object.name = os.path.basename(self.filepath)
-        imported_object.data.name = os.path.basename(self.filepath)
-        bpy.data.meshes.remove(proxy_object.data)
-            
         return {'FINISHED'}