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

glTF exporter: Non active action objects TRS is now restored at end of actions exports

parent 05f475f2
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,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": (3, 4, 41),
"version": (3, 4, 42),
'blender': (3, 3, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
......
......@@ -62,8 +62,14 @@ def gather_animations( obj_uuid: int,
current_action = None
current_world_matrix = None
if blender_object.animation_data and blender_object.animation_data.action:
# There is an active action. Storing it, to be able to restore after switching all actions during export
current_action = blender_object.animation_data.action
elif len(blender_actions) != 0 and blender_object.animation_data is not None and blender_object.animation_data.action is None:
# No current action set, storing world matrix of object
current_world_matrix = blender_object.matrix_world.copy()
# Remove any solo (starred) NLA track. Restored after export
solo_track = None
if blender_object.animation_data:
......@@ -134,6 +140,9 @@ def gather_animations( obj_uuid: int,
blender_object.animation_data.use_tweak_mode = restore_tweak_mode
blender_object.animation_data.use_nla = current_use_nla
if current_world_matrix is not None:
blender_object.matrix_world = current_world_matrix
export_user_extensions('animation_switch_loop_hook', export_settings, blender_object, True)
return animations, tracks
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment