From e716a3503d0e4ece893d42e394e684ebce90ea4e Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Sat, 14 Mar 2015 12:05:12 +0100
Subject: [PATCH] Fix T43979: FBX Animation import regression.
To be backported to final release.
---
io_scene_fbx/import_fbx.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index dbf64ee69..10a17dd30 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
--
GitLab