diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-02-23 14:13:28 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-02-23 14:13:28 +0300 |
| commit | bdfb44b4256c683360f05f5bde7159660f82c7b5 (patch) | |
| tree | 960f527d2ed0283590bf50b55642c32c56db8397 | |
| parent | 593c699b2a50213263e706d34753a9e25ac1a26f (diff) | |
| parent | b1356069278fbc2238272dc51e84b064b177b49f (diff) | |
Merge branch 'blender-v3.1-release'
| -rw-r--r-- | io_scene_fbx/__init__.py | 2 | ||||
| -rw-r--r-- | io_scene_fbx/import_fbx.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 6f9dacb9..cf7b75a8 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -5,7 +5,7 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (4, 33, 0), + "version": (4, 33, 1), "blender": (3, 2, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index 78b315b2..7efd3ab1 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -752,7 +752,10 @@ def blen_read_animations(fbx_tmpl_astack, fbx_tmpl_alayer, stacks, scene, anim_o key = (as_uuid, al_uuid, id_data) action = actions.get(key) if action is None: - action_name = "|".join((id_data.name, stack_name, layer_name)) + if stack_name == layer_name: + action_name = "|".join((id_data.name, stack_name)) + else: + action_name = "|".join((id_data.name, stack_name, layer_name)) actions[key] = action = bpy.data.actions.new(action_name) action.use_fake_user = True # If none yet assigned, assign this action to id_data. |