[Bf-extensions-cvs] [45b1e42] blender-v2.75-release: Fix T45176: FBX import - mismatch in camera rotation (bad rotation order).

Bastien Montagne noreply at git.blender.org
Mon Jun 29 15:45:53 CEST 2015


Commit: 45b1e42fffd550b4250f953a1933892c913b7182
Author: Bastien Montagne
Date:   Wed Jun 24 20:12:59 2015 +0200
Branches: blender-v2.75-release
https://developer.blender.org/rBA45b1e42fffd550b4250f953a1933892c913b7182

Fix T45176: FBX import - mismatch in camera rotation (bad rotation order).

Somehow our mapping from FBX int 'enum' code to string representation of rotation order
was pure nonsense, only giving correct result for default 'XYZ'.

Note that we fallback to EulerXYZ in case of 'SphericXYZ', not even sure what this is!

Conflicts:
	io_scene_fbx/__init__.py

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

M	io_scene_fbx/import_fbx.py

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

diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index 7a2808d..3124e8d 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -478,12 +478,12 @@ def blen_read_object_transform_preprocess(fbx_props, fbx_obj, rot_alt_mat, use_p
             pst_rot = const_vector_zero_3d
         rot_ord = {
             0: 'XYZ',
-            1: 'XYZ',
-            2: 'XZY',
-            3: 'YZX',
-            4: 'YXZ',
-            5: 'ZXY',
-            6: 'ZYX',
+            1: 'XZY',
+            2: 'YZX',
+            3: 'YXZ',
+            4: 'ZXY',
+            5: 'ZYX',
+            6: 'XYZ',  # XXX eSphericXYZ, not really supported...
             }.get(elem_props_get_enum(fbx_props, b'RotationOrder', 0))
     else:
         pre_rot = const_vector_zero_3d



More information about the Bf-extensions-cvs mailing list