diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index 0d388d9705a9a63c43c3664dee2e99c8f807c14d..fd3d2d56ee1b8565a506b5cba9e8663945f68643 100755 --- a/io_scene_gltf2/__init__.py +++ b/io_scene_gltf2/__init__.py @@ -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, 3, 3), + "version": (3, 3, 4), 'blender': (3, 3, 0), 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py index 143fcceac4fc083a8a7eba8bd1fa82e825294ca3..1ee98a29f91348568da0c681b21d7854e3149095 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py @@ -391,8 +391,9 @@ def __gather_output(channels: typing.Tuple[bpy.types.FCurve], parent_uuid = export_settings['vtree'].nodes[export_settings['vtree'].nodes[blender_obj_uuid].bones[bone.name]].parent_uuid if parent_uuid is not None and export_settings['vtree'].nodes[parent_uuid].blender_type == VExportNode.BONE: # export bone is not at root of armature neither + blender_bone_parent = export_settings['vtree'].nodes[parent_uuid].blender_bone correction_matrix_local = ( - bone.parent.bone.matrix_local.inverted_safe() @ + blender_bone_parent.bone.matrix_local.inverted_safe() @ bone.bone.matrix_local ) else: diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py index 8642fe997ae5890cb0f3bfde6cb923b5281a522b..fd53b291fb7b4939bdeb861bba465018e0b718b2 100644 --- a/object_collection_manager/__init__.py +++ b/object_collection_manager/__init__.py @@ -6,7 +6,7 @@ bl_info = { "name": "Collection Manager", "description": "Manage collections and their objects", "author": "Ryan Inch", - "version": (2, 24, 0), + "version": (2, 24, 1), "blender": (2, 80, 0), "location": "View3D - Object Mode (Shortcut - M)", "warning": '', # used for warning icon and text in addons panel diff --git a/object_collection_manager/cm_init.py b/object_collection_manager/cm_init.py index 39c7ede8be1f169172cf2bf25bad9239339e4267..38080cb883d606562c11414c18f72cbc52167b3a 100644 --- a/object_collection_manager/cm_init.py +++ b/object_collection_manager/cm_init.py @@ -116,6 +116,13 @@ def undo_redo_post_handler(dummy): internals.move_active = None +@persistent +def global_load_pre_handler(dummy): + internals.move_triggered = False + internals.move_selection.clear() + internals.move_active = None + + def menu_addition(self, context): layout = self.layout @@ -180,6 +187,7 @@ def register_cm(): bpy.app.handlers.depsgraph_update_post.append(depsgraph_update_post_handler) bpy.app.handlers.undo_post.append(undo_redo_post_handler) bpy.app.handlers.redo_post.append(undo_redo_post_handler) + bpy.app.handlers.load_pre.append(global_load_pre_handler) preferences = bpy.context.preferences.addons[__package__].preferences if preferences.enable_disable_objects_override: @@ -202,6 +210,7 @@ def unregister_cm(): bpy.app.handlers.depsgraph_update_post.remove(depsgraph_update_post_handler) bpy.app.handlers.undo_post.remove(undo_redo_post_handler) bpy.app.handlers.redo_post.remove(undo_redo_post_handler) + bpy.app.handlers.load_pre.remove(global_load_pre_handler) del bpy.types.Scene.collection_manager