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>2017-11-06 17:57:18 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-01-01 18:30:53 +0300
commit098e55d61e3646f3813078234c52a8321acb45bc (patch)
tree3c6a5f1ea9ced9d7b74e9f2f82eb4814d711c45b
parent213b0b5ff5d19468bf458915a6c78a406c97d619 (diff)
Fix T53254: Fbx import assertion error on some Enum custom property.
Do not try to get some string namecode of Enum items if string part of the custom FBX Enum property is empty! Just stick to basic int value in this case. Conflicts: io_scene_fbx/__init__.py
-rw-r--r--io_scene_fbx/import_fbx.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index 0eb415a5..17f27c64 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -343,7 +343,7 @@ def blen_read_custom_properties(fbx_obj, blen_obj, settings):
elif prop_type in {b'Enum', b'enum'}:
assert(fbx_prop.props_type[4:6] == bytes((data_types.INT32, data_types.STRING)))
val = fbx_prop.props[4]
- if settings.use_custom_props_enum_as_string:
+ if settings.use_custom_props_enum_as_string and fbx_prop.props[5]:
enum_items = fbx_prop.props[5].decode('utf-8').split('~')
assert(val >= 0 and val < len(enum_items))
blen_obj[prop_name] = enum_items[val]