Merge ce473a357e into bb4b07b7af

tools/gltf_auto_export/auto_export/export_gltf.py

@@ -1,7 +1,5 @@
 import os
 import bpy
-
-from .get_standard_exporter_settings import get_standard_exporter_settings
 from .preferences import (AutoExportGltfPreferenceNames)
 
 def generate_gltf_export_preferences(addon_prefs): 
@@ -39,31 +37,10 @@ def generate_gltf_export_preferences(addon_prefs):
         export_optimize_animation_size=False
     )
         
-
-   
-
     for key in addon_prefs.__annotations__.keys():
         if str(key) not in AutoExportGltfPreferenceNames:
             #print("overriding setting", key, "value", getattr(addon_prefs,key))
-            gltf_export_preferences[key] = getattr(addon_prefs, key)
-
-
-    """standard_gltf_exporter_settings = get_standard_exporter_settings()
-    print("standard settings", standard_gltf_exporter_settings)
-    
-    constant_keys = [
-        'export_cameras',
-        'export_extras', # For custom exported properties.
-        'export_lights',
-    ]
-
-    # a certain number of essential params should NEVER be overwritten , no matter the settings of the standard exporter
-    for key in standard_gltf_exporter_settings.keys():
-        if str(key) not in constant_keys:
-            gltf_export_preferences[key] =  standard_gltf_exporter_settings.get(key)
-
-    print("final export preferences", gltf_export_preferences)"""
-
+            gltf_export_preferences[key] = getattr(addon_prefs,key)
 
     return gltf_export_preferences
 

tools/gltf_auto_export/auto_export/get_standard_exporter_settings.py

@@ -1,9 +1,6 @@
 import bpy 
 
 def get_standard_exporter_settings():
-    settings_key = 'glTF2ExportSettings'
     for scene in bpy.data.scenes:
-        if settings_key in scene:
-            settings = scene[settings_key]
-            #print("standard exporter settings", settings, dict(settings))
-            return dict(settings)
+        if 'glTF2ExportSettings' in scene:
+            print("standard exporter settings", scene['glTF2ExportSettings'])

tools/gltf_auto_export/helpers/helpers_scenes.py

@@ -208,6 +208,9 @@ def get_scenes(addon_prefs):
     
     return [level_scene_names, level_scenes, library_scene_names, library_scenes]
 
+
+
+
 def inject_blueprints_list_into_main_scene(scene):
     print("injecting assets/blueprints data into scene")
     root_collection = scene.collection