From d0aa840bff2c7007d7f8595fa5f0475f9872e3f0 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Wed, 27 Mar 2019 08:52:53 +0100
Subject: [PATCH] Fix T62984: Backtrace when importing FBX file from the Unity
 asset store.

Although we had no way to reproduce the issue, that fix indeed seems
needed from code logic point of view.

Investigation and patch by Pete Chown (@PeteX), thanks!
---
 io_scene_fbx/__init__.py   | 2 +-
 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 2aab8d0aa..68bdf96f3 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, 14, 4),
+    "version": (4, 14, 5),
     "blender": (2, 80, 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 08b7c0fe3..26e31363f 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -717,7 +717,7 @@ def blen_read_animations(fbx_tmpl_astack, fbx_tmpl_alayer, stacks, scene, anim_o
                     id_data = item.bl_obj
                     # XXX Ignore rigged mesh animations - those are a nightmare to handle, see note about it in
                     #     FbxImportHelperNode class definition.
-                    if id_data.type == 'MESH' and id_data.parent and id_data.parent.type == 'ARMATURE':
+                    if id_data and id_data.type == 'MESH' and id_data.parent and id_data.parent.type == 'ARMATURE':
                         continue
                 if id_data is None:
                     continue
-- 
GitLab