Merge pull request #2287 from KhronosGroup/fix_2286

Avoid crash animation + full collection hierarchy
KhronosGroup · Jul 23, 2024 · 68ba8c3 · 68ba8c3
2 parents fd6f411 + eaed33c
commit 68ba8c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_action.py b/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_action.py
@@ -41,6 +41,10 @@ def gather_actions_animations(export_settings):
     vtree = export_settings['vtree']
     for obj_uuid in vtree.get_all_objects():
 
+        # Do not manage real collections (if case of full hierarchy export)
+        if vtree.nodes[obj_uuid].blender_type == VExportNode.COLLECTION:
+            continue
+
         # Do not manage not exported objects
         if vtree.nodes[obj_uuid].node is None:
             if export_settings["gltf_armature_object_remove"] is True:
@@ -78,6 +82,7 @@ def prepare_actions_range(export_settings):
     vtree = export_settings['vtree']
     for obj_uuid in vtree.get_all_objects():
 
+        # Do not manage real collections (if case of full hierarchy export)
         if vtree.nodes[obj_uuid].blender_type == VExportNode.COLLECTION:
             continue
 
@@ -191,6 +196,10 @@ def prepare_actions_range(export_settings):
         # Need to store animation slides
         for obj_uuid in vtree.get_all_objects():
 
+            # Do not manage real collections (if case of full hierarchy export)
+            if vtree.nodes[obj_uuid].blender_type == VExportNode.COLLECTION:
+                continue
+
             # Do not manage not exported objects
             if vtree.nodes[obj_uuid].node is None:
                 if export_settings['gltf_armature_object_remove'] is True:

diff --git a/...cene_gltf2/blender/exp/animation/sampled/gltf2_blender_gather_animation_sampling_cache.py b/...cene_gltf2/blender/exp/animation/sampled/gltf2_blender_gather_animation_sampling_cache.py
@@ -358,6 +358,11 @@ def armature_caching(data, obj_uuid, blender_obj, action_name, frame, export_set
 
 def object_caching(data, obj_uuids, current_instance, action_name, frame, depsgraph, export_settings):
     for obj_uuid in obj_uuids:
+
+        # Do not cache real collection
+        if export_settings['vtree'].nodes[obj_uuid].blender_type == VExportNode.COLLECTION:
+            continue
+
         blender_obj = export_settings['vtree'].nodes[obj_uuid].blender_object
         if blender_obj is None: #GN instance
             if export_settings['vtree'].nodes[obj_uuid].parent_uuid not in current_instance.keys():