diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-18 16:27:38 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-01 18:27:18 +0300 |
| commit | d42d87dde88e29df4f59241ba2e34967103492e5 (patch) | |
| tree | 4a3d7b09df466ff8010f3e32b1dac3fffda24aa8 | |
| parent | 14e04305021a83fc4a89ad4192b6b8611ca4139c (diff) | |
Fix T53065: stupid animation linked to nothing in FBX file broke import.
Conflicts:
io_scene_fbx/__init__.py
| -rw-r--r-- | io_scene_fbx/__init__.py | 4 | ||||
| -rw-r--r-- | io_scene_fbx/import_fbx.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 4133e606..3c1a8ffd 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,8 +21,8 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (3, 7, 13), - "blender": (2, 77, 0), + "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", "warning": "", diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index 77540eea..0eb415a5 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -2802,7 +2802,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. |