diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-18 16:27:38 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-18 16:27:38 +0300 |
| commit | 89285a88abbeb6886da3eefa9818012c6d760886 (patch) | |
| tree | 91b0212a19824b6dd7705a8b673fc077961c06a1 /io_scene_fbx | |
| parent | dd2126b0988e6efa6a29b47cfefb659ec7952b68 (diff) | |
Fix T53065: stupid animation linked to nothing in FBX file broke import.
Diffstat (limited to 'io_scene_fbx')
| -rw-r--r-- | io_scene_fbx/__init__.py | 2 | ||||
| -rw-r--r-- | io_scene_fbx/import_fbx.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index e243b877..3c1a8ffd 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": (3, 7, 14), + "version": (3, 7, 15), "blender": (2, 79, 1), "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 ecbbb898..0fddeeca 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -2801,7 +2801,7 @@ def load(operator, context, filepath="", if lnk_prop in {b'Lcl Translation', b'Lcl Rotation', b'Lcl Scaling'}: # n_uuid can (????) be linked to root '0' node, instead of a mere object node... See T41712. ob = fbx_helper_nodes.get(n_uuid, None) - if ob is None: + if ob is None or ob.is_root: continue items.append((ob, lnk_prop)) elif lnk_prop == b'DeformPercent': # Shape keys. |