Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-03-27 10:52:53 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-03-27 10:56:40 +0300
commitad2ee4cd6f97d2bfbe6a77e76baa5ad4de8e4b34 (patch)
tree75be3cb4e6b25b852537947917e2e402fc17eeee
parent97bd21860f110abb72e9f8ed8530bfe565470264 (diff)
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!
-rw-r--r--io_scene_fbx/__init__.py2
-rw-r--r--io_scene_fbx/import_fbx.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index fddeda6c..569613fc 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, 10, 0),
+ "version": (3, 10, 1),
"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 a8185207..2fa9f637 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