[Bf-extensions-cvs] [4e1ab4a3] master: glTF exporer: hook entire glTF data for extensions

[Julien Duroure]

Commit: 4e1ab4a386d5c78bf173bd5d58a4ceb8783c8661
Author: Julien Duroure
Date:   Wed Apr 7 19:38:52 2021 +0200
Branches: master
https://developer.blender.org/rBA4e1ab4a386d5c78bf173bd5d58a4ceb8783c8661

glTF exporer: hook entire glTF data for extensions

===================================================================

M	io_scene_gltf2/__init__.py
M	io_scene_gltf2/blender/exp/gltf2_blender_export.py
M	io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py

===================================================================

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index c67597b8..4c229f4c 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -15,7 +15,7 @@
 bl_info = {
     'name': 'glTF 2.0 format',
     'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (1, 6, 8),
+    "version": (1, 6, 9),
     'blender': (2, 91, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_export.py b/io_scene_gltf2/blender/exp/gltf2_blender_export.py
index a0ae17f6..ce2b9721 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_export.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_export.py
@@ -65,16 +65,15 @@ def __export(export_settings):
     exporter.finalize_images()
     json = __fix_json(exporter.glTF.to_dict())
 
+    export_user_extensions('gather_gltf_hook', export_settings, exporter.glTF)
+    exporter.traverse_extensions()
+
     return json, buffer
 
 
 def __gather_gltf(exporter, export_settings):
     active_scene_idx, scenes, animations = gltf2_blender_gather.gather_gltf2(export_settings)
 
-    plan = {'active_scene_idx': active_scene_idx, 'scenes': scenes, 'animations': animations}
-    export_user_extensions('gather_gltf_hook', export_settings, plan)
-    active_scene_idx, scenes, animations = plan['active_scene_idx'], plan['scenes'], plan['animations']
-
     if export_settings['gltf_draco_mesh_compression']:
         gltf2_io_draco_compression_extension.encode_scene_primitives(scenes, export_settings)
         exporter.add_draco_extension()
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py b/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py
index ac71ffd5..77ea0c57 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py
@@ -259,6 +259,10 @@ class GlTF2Exporter:
         d[key] = d_key
         return cls.__get_key_path(d[key], keypath, default)
 
+
+    def traverse_extensions(self):
+        self.__traverse(self.__gltf.extensions)
+
     def __traverse(self, node):
         """
         Recursively traverse a scene graph consisting of gltf compatible elements.