diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-14 14:05:12 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-17 13:51:17 +0300 |
commit | c09c5607de9f14222c1ad0290a03a55be9c7790c (patch) | |
tree | a9e2a5be36608e4c26d9eb15f5940322fcdb606e | |
parent | de9caebc6a7aea055c108e94fb8f4bb47b8dcfca (diff) |
Fix T43979: FBX Animation import regression.
To be backported to final release.
-rw-r--r-- | io_scene_fbx/import_fbx.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index dbf64ee6..10a17dd3 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -2007,7 +2007,9 @@ class FbxImportHelperNode: # Among other things, why in hell isn't it taken into account by bindpose & co??? # Probably because org app (max) handles it completely aside from any parenting stuff, # which we obviously cannot do in Blender. :/ - amat = settings.global_matrix * (amat if amat is not None else self.bind_matrix) + if amat is None: + amat = self.bind_matrix + amat = settings.global_matrix * (Matrix() if amat is None else amat) if self.matrix_geom: amat = amat * self.matrix_geom mmat = settings.global_matrix * mmat |