safer undo_transforms; UI improvements.

Author: caioraphael1

__init__.py

@@ -6,7 +6,7 @@
 bl_info = {
     "name": "Better glTF Exporter",
     "author": "Caio Raphael (inspired by MrTriPie's Super Batch Exporter)",
-    "version": (1, 0, 1),
+    "version": (1, 0, 2),
     "blender": (4, 1, 0),
     "category": "Import-Export",
     "location": "Set in preferences below. Default: Top Bar (After File, Edit, ...Help)",
@@ -154,11 +154,12 @@ def draw_settings(self, context):
 
         self.layout.separator()
 
-        col = self.layout.column(align=True)
-        col.label(text="TEXTURE")
-        col.prop(settings, 'texture_directory')
+        if settings.gltf_format == 'GLTF_SEPARATE':
+            col = self.layout.column(align=True)
+            col.label(text="TEXTURE")
+            col.prop(settings, 'texture_directory')
 
-        self.layout.separator()
+            self.layout.separator()
 
 
         col = self.layout.column(align=True)
@@ -281,12 +282,14 @@ class EXPORT_MESH_OT_batch(Operator):
     old_locations = []
     old_rotations = []
     old_scales = []
+    objects_to_undo = []
+
     file_count = 0
 
     def execute(self, context):
         settings = context.scene.batch_export
 
-        print('\n\nStart:\n')
+        print('\n\n\n\n ============================= STARTING =============================\n')
 
         # Verificação das texturas.
         dir = settings.directory
@@ -358,76 +361,73 @@ def execute(self, context):
             objects_to_export = self.intersection(objects_to_export, active_scene.objects)
         objects_to_export = self.intersection(objects_to_export, objects_by_type)
 
-
         print('Objects to export:', objects_to_export)
 
-        # Chamada da exportação Normal ou Batch.
-        export_config = self.get_config_export(context, tex_dir)
 
         self.clear_objects_transform(context, objects_to_export)
 
+        try:
+            # Get export configurations, based on the user choices.
+            export_config = self.get_config_export(context, tex_dir)
 
-        if settings.export_mode == 'NORMAL_EXPORT':
-            bpy.ops.object.select_all(action='DESELECT')
-            for obj in objects_to_export:
-                obj.select_set(True)
-            self.export_selection(context, export_config, dir, active_scene.name)
-        elif settings.export_mode == 'BATCH_EXPORT':
-            if settings.batch_export_mode == 'OBJECTS':
-                for obj in objects_to_export:
-                    bpy.ops.object.select_all(action='DESELECT')
-                    obj.select_set(True)
-                    self.export_selection(context, export_config, dir, obj.name)
-            elif settings.batch_export_mode == 'PARENTS':
+            # Processo de exportação.
+            if settings.export_mode == 'NORMAL_EXPORT':
+                bpy.ops.object.select_all(action='DESELECT')
                 for obj in objects_to_export:
-                    # Apenas itere pelos pais ignorando os filhos, uma vez que eles serão exportados junto com seu respectivo pai.
-                    if obj.parent:
-                        continue
-                    bpy.ops.object.select_all(action='DESELECT')
                     obj.select_set(True)
-                    self.select_children_recursive(obj, context)
-                    self.export_selection(context, export_config, dir, obj.name)
-            elif settings.batch_export_mode == 'COLLECTIONS':
-                unique_collections = []
-                for obj in objects_to_export:
-                    if not obj.users_collection in unique_collections:
-                        unique_collections.append(obj.users_collection[0])
-                for col in unique_collections:
-                    bpy.ops.object.select_all(action='DESELECT')
-                    for obj in col.objects:
+                self.export_selection(context, export_config, dir, active_scene.name)
+            elif settings.export_mode == 'BATCH_EXPORT':
+                if settings.batch_export_mode == 'OBJECTS':
+                    for obj in objects_to_export:
+                        bpy.ops.object.select_all(action='DESELECT')
+                        obj.select_set(True)
+                        self.export_selection(context, export_config, dir, obj.name)
+                elif settings.batch_export_mode == 'PARENTS':
+                    for obj in objects_to_export:
+                        # Apenas itere pelos pais ignorando os filhos, uma vez que eles serão exportados junto com seu respectivo pai.
+                        if obj.parent:
+                            continue
+                        bpy.ops.object.select_all(action='DESELECT')
                         obj.select_set(True)
-                    self.export_selection(context, export_config, dir, col.name)
+                        self.select_children_recursive(obj, context)
+                        self.export_selection(context, export_config, dir, obj.name)
+                elif settings.batch_export_mode == 'COLLECTIONS':
+                    unique_collections = []
+                    for obj in objects_to_export:
+                        if not obj.users_collection in unique_collections:
+                            unique_collections.append(obj.users_collection[0])
+                    for col in unique_collections:
+                        bpy.ops.object.select_all(action='DESELECT')
+                        for obj in col.objects:
+                            obj.select_set(True)
+                        self.export_selection(context, export_config, dir, col.name)
+
+            # Verifica se nada foi exportado, ou quantos arquivos foram exportados.
+            self.file_count = len(objects_to_export)
+            if self.file_count == 0:
+                self.report({'ERROR'}, "NOTHING TO EXPORT")
+            elif settings.export_mode == 'NORMAL_EXPORT':
+                self.report({'INFO'}, f"Exported 1 file [ {str(self.file_count)} object(s) ]")
+            elif settings.export_mode == 'BATCH_EXPORT':
+                self.report({'INFO'}, f"Exported {str(self.file_count)} file(s)")
 
+        except (NameError, IndexError):
+            self.report({'INFO'}, "EXPORT ERROR")
 
-        self.undo_objects_transform(context, objects_to_export)
 
+        # Return transform to how it was.
+        self.undo_objects_transform(context)
 
         # Return selection to how it was.
         bpy.ops.object.select_all(action='DESELECT')
         for obj in selected:
             obj.select_set(True)
         context.view_layer.objects.active = active_object
 
-        # Return to whatever mode the user was in
+        # Return to whatever mode the user was in.
         if active_object:
             bpy.ops.object.mode_set(mode=tab_mode)
 
-        self.file_count = len(objects_to_export)
-
-        # Verifica se nada foi exportado, ou quantos arquivos foram exportados.
-        if settings.export_mode == 'NORMAL_EXPORT':
-            if self.file_count == 0:
-                self.report({'ERROR'}, "NOTHING TO EXPORT")
-            else:
-                self.report({'INFO'}, "Exported 1 file [" +
-                            str(self.file_count) + " object(s)]")
-        elif settings.export_mode == 'BATCH_EXPORT':
-            if self.file_count == 0:
-                self.report({'ERROR'}, "NOTHING TO EXPORT")
-            else:
-                self.report({'INFO'}, "Exported " +
-                            str(self.file_count) + " file(s)")
-
         return {'FINISHED'}
 
 
@@ -452,10 +452,16 @@ def clear_objects_transform(self, context, objects_to_export):
         self.old_locations = []
         self.old_rotations = []
         self.old_scales = []
+
+        self.objects_to_undo = []
+
         for obj in objects_to_export:
             # Apenas itere pelos pais ignorando os filhos.
             if obj.parent:
                 continue
+            
+            self.objects_to_undo.append(obj)
+
             if settings.clear_location:
                 self.old_locations.append(obj.location.copy()) 
                 obj.location = (0.0, 0.0, 0.0)
@@ -465,17 +471,13 @@ def clear_objects_transform(self, context, objects_to_export):
             if settings.clear_scale:
                 self.old_scales.append(obj.scale.copy())
                 obj.scale = (0.0, 0.0, 0.0)
-
-            # If exporting by parent, don't set child (object that has a parent) transform.
-            #if settings.export_mode != "OBJECT_PARENTS" or not obj.parent:
+            
 
 
-    def undo_objects_transform(self, context, objects_to_export):
+    def undo_objects_transform(self, context):
         settings = context.scene.batch_export
 
-        for i, obj in enumerate(objects_to_export):
-            if obj.parent:
-                continue
+        for i, obj in enumerate(self.objects_to_undo):
             if settings.clear_location:
                 obj.location = self.old_locations[i]
             if settings.clear_rotation: