[Bf-extensions-cvs] [d42d87dd] blender-v2.79a-release: Fix T53065: stupid animation linked to nothing in FBX file broke import.

[Bastien Montagne]

Commit: d42d87dde88e29df4f59241ba2e34967103492e5
Author: Bastien Montagne
Date:   Wed Oct 18 15:27:38 2017 +0200
Branches: blender-v2.79a-release
https://developer.blender.org/rBAd42d87dde88e29df4f59241ba2e34967103492e5

Fix T53065: stupid animation linked to nothing in FBX file broke import.

Conflicts:
	io_scene_fbx/__init__.py

===================================================================

M	io_scene_fbx/__init__.py
M	io_scene_fbx/import_fbx.py

===================================================================

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.