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>2015-03-14 14:05:12 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-03-14 14:05:12 +0300
commite716a3503d0e4ece893d42e394e684ebce90ea4e (patch)
tree634dd633e2bc9f1d191e27ea1bded21cc0e287ea
parentf6563591ddbc1c291882d604b40383636c6b2aa6 (diff)
Fix T43979: FBX Animation import regression.
To be backported to final release.
-rw-r--r--io_scene_fbx/import_fbx.py4
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