Merge pull request #2313 from KhronosGroup/fix_2253

Fix #2253 - distinct import & export draw
KhronosGroup · Sep 26, 2024 · b3b91d0 · b3b91d0
1 parent 5256e79
commit b3b91d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/addons/io_scene_gltf2/__init__.py b/addons/io_scene_gltf2/__init__.py
@@ -1008,7 +1008,7 @@ def invoke(self, context, event):
         for addon_name in preferences.addons.keys():
             try:
                 if hasattr(sys.modules[addon_name], 'glTF2ExportUserExtension') or hasattr(sys.modules[addon_name], 'glTF2ExportUserExtensions'):
-                    exporter_extension_layout_draw[addon_name] = sys.modules[addon_name].draw
+                    exporter_extension_layout_draw[addon_name] = sys.modules[addon_name].draw if hasattr(sys.modules[addon_name], 'draw_export') else sys.modules[addon_name].draw
             except Exception:
                 pass
 
@@ -1835,7 +1835,7 @@ def invoke(self, context, event):
         for addon_name in preferences.addons.keys():
             try:
                 if hasattr(sys.modules[addon_name], 'glTF2ImportUserExtension') or hasattr(sys.modules[addon_name], 'glTF2ImportUserExtensions'):
-                    importer_extension_layout_draw[addon_name] = sys.modules[addon_name].draw
+                    importer_extension_layout_draw[addon_name] = sys.modules[addon_name].draw_import if hasattr(sys.modules[addon_name], 'draw_import') else sys.modules[addon_name].draw
             except Exception:
                 pass
 

diff --git a/example-addons/example_gltf_exporter_extension/__init__.py b/example-addons/example_gltf_exporter_extension/__init__.py
@@ -45,7 +45,7 @@ def unregister():
     del bpy.types.Scene.ExampleExtensionProperties
 
 
-def draw(context, layout):
+def draw_export(context, layout):
     header, body = layout.panel("GLTF_addon_example_exporter", default_closed=False)
 
     props = bpy.context.scene.ExampleExtensionProperties

diff --git a/example-addons/example_gltf_importer_extension/__init__.py b/example-addons/example_gltf_importer_extension/__init__.py
@@ -34,7 +34,7 @@ class ExampleImporterExtensionProperties(bpy.types.PropertyGroup):
 
 
 
-def draw(context, layout):
+def draw_import(context, layout):
     header, body = layout.panel("GLTF_addon_example_importer", default_closed=False)
 
     props = bpy.context.scene.ExampleImporterExtensionProperties