diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-02 19:25:57 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-02 19:25:57 +0300 |
commit | 2c2c7751c41765e35422f5da2fb1650ec9637721 (patch) | |
tree | d0218e0097fa3f37fc99c325e5a11a3213341b1c | |
parent | fb661e5a13e09d64629d5b3a8d88b1ba5df628f7 (diff) |
Fix T46912: FBX import from Wow Model Viewer not working.
First file ever having 'Limb' (in addition to 'LimbNode'!) bones... Looks like we can more or less
use them as 'LimbNode' ones, though.
-rw-r--r-- | io_scene_fbx/__init__.py | 2 | ||||
-rw-r--r-- | io_scene_fbx/import_fbx.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index f1a19c0b..9ccc5b7f 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, 6, 5), + "version": (3, 7, 0), "blender": (2, 76, 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 9b37f7d2..b8429071 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -2534,7 +2534,9 @@ def load(operator, context, filepath="", assert(fbx_props[0] is not None) transform_data = blen_read_object_transform_preprocess(fbx_props, fbx_obj, Matrix(), use_prepost_rot) - is_bone = fbx_obj.props[2] in {b'LimbNode'} # Note: 'Root' "bones" are handled as (armature) objects. + # Note: 'Root' "bones" are handled as (armature) objects. + # Note: See T46912 for first FBX file I ever saw with 'Limb' bones - thought those were totally deprecated. + is_bone = fbx_obj.props[2] in {b'LimbNode', b'Limb'} fbx_helper_nodes[a_uuid] = FbxImportHelperNode(fbx_obj, bl_data, transform_data, is_bone) # add parent-child relations and add blender data to the node |