diff options
Diffstat (limited to 'io_scene_fbx')
-rw-r--r-- | io_scene_fbx/__init__.py | 2 | ||||
-rw-r--r-- | io_scene_fbx/import_fbx.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index b737cef0..2782353f 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (4, 17, 0), + "version": (4, 17, 1), "blender": (2, 81, 6), "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 5556f968..27e46076 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -1898,7 +1898,11 @@ class FbxImportHelperNode: meshes = set() for child in self.children: - child.collect_skeleton_meshes(meshes) + # Children meshes may be linked to children armatures, in which case we do not want to link them + # to a parent one. See T70244. + child.collect_armature_meshes() + if not child.meshes: + child.collect_skeleton_meshes(meshes) for m in meshes: old_matrix = m.matrix m.matrix = armature_matrix_inv @ m.get_world_matrix() |