[Bf-extensions-cvs] [c09c560] : Fix T43979: FBX Animation import regression.

[Bastien Montagne]

Commit: c09c5607de9f14222c1ad0290a03a55be9c7790c
Author: Bastien Montagne
Date:   Sat Mar 14 12:05:12 2015 +0100
Branches: 
https://developer.blender.org/rBAc09c5607de9f14222c1ad0290a03a55be9c7790c

Fix T43979: FBX Animation import regression.

To be backported to final release.

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

M	io_scene_fbx/import_fbx.py

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

diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index dbf64ee..10a17dd 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