[Bf-extensions-cvs] [c0e016d] master: Fix importer adding needless empty to armatures.

Bastien Montagne noreply at git.blender.org
Fri Dec 19 12:49:31 CET 2014


Commit: c0e016dd83a243cb082b21d7477469719f0c9692
Author: Bastien Montagne
Date:   Fri Dec 19 12:48:49 2014 +0100
Branches: master
https://developer.blender.org/rBAc0e016dd83a243cb082b21d7477469719f0c9692

Fix importer adding needless empty to armatures.

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

M	io_scene_fbx/import_fbx.py

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

diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index d25684c..1db465f 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -1443,7 +1443,7 @@ class FbxImportHelperNode:
                 needs_armature = True
                 break
         if needs_armature:
-            if self.fbx_type == b'Null':
+            if self.fbx_type in {b'Null', b'Root'}:
                 # if empty then convert into armature
                 self.is_armature = True
             else:
@@ -1476,7 +1476,7 @@ class FbxImportHelperNode:
         if in_armature and not self.is_bone and self.has_bone_children:
             self.is_bone = True
             # if we are not a null node we need an intermediate node for the data
-            if self.fbx_type != b'Null':
+            if self.fbx_type not in {b'Null', b'Root'}:
                 node = FbxImportHelperNode(self.fbx_elem, self.bl_data, None, False)
                 self.fbx_elem = None
                 self.bl_data = None



More information about the Bf-extensions-cvs mailing list