Skip to content
Snippets Groups Projects
Commit 73b85949 authored by Julien Duroure's avatar Julien Duroure
Browse files

glTF exporter: allow addons with multiple extensions

parent 4cdb8df8
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
bl_info = { bl_info = {
'name': 'glTF 2.0 format', 'name': 'glTF 2.0 format',
'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors', 'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
"version": (1, 1, 29), "version": (1, 1, 30),
'blender': (2, 81, 6), 'blender': (2, 81, 6),
'location': 'File > Import-Export', 'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0', 'description': 'Import-Export as glTF 2.0',
...@@ -356,7 +356,7 @@ class ExportGLTF2_Base: ...@@ -356,7 +356,7 @@ class ExportGLTF2_Base:
preferences = bpy.context.preferences preferences = bpy.context.preferences
for addon_name in preferences.addons.keys(): for addon_name in preferences.addons.keys():
try: try:
if hasattr(sys.modules[addon_name], 'glTF2ExportUserExtension'): if hasattr(sys.modules[addon_name], 'glTF2ExportUserExtension') or hasattr(sys.modules[addon_name], 'glTF2ExportUserExtensions'):
extension_panel_unregister_functors.append(sys.modules[addon_name].register_panel()) extension_panel_unregister_functors.append(sys.modules[addon_name].register_panel())
self.has_active_extenions = True self.has_active_extenions = True
except Exception: except Exception:
...@@ -468,6 +468,10 @@ class ExportGLTF2_Base: ...@@ -468,6 +468,10 @@ class ExportGLTF2_Base:
if hasattr(sys.modules[addon_name], 'glTF2ExportUserExtension'): if hasattr(sys.modules[addon_name], 'glTF2ExportUserExtension'):
extension_ctor = sys.modules[addon_name].glTF2ExportUserExtension extension_ctor = sys.modules[addon_name].glTF2ExportUserExtension
user_extensions.append(extension_ctor()) user_extensions.append(extension_ctor())
if hasattr(sys.modules[addon_name], 'glTF2ExportUserExtensions'):
extension_ctors = sys.modules[addon_name].glTF2ExportUserExtensions
for extension_ctor in extension_ctors:
user_extensions.append(extension_ctor())
export_settings['gltf_user_extensions'] = user_extensions export_settings['gltf_user_extensions'] = user_extensions
return gltf2_blender_export.save(context, export_settings) return gltf2_blender_export.save(context, export_settings)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment