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-06-24 21:12:59 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-06-29 16:45:30 +0300
commit45b1e42fffd550b4250f953a1933892c913b7182 (patch)
treec9070ed6d50d15ea33af2a47536d63c5e5f98b40
parent470e77c2e5437d82303d2699d634a6fec8bee7d1 (diff)
Fix T45176: FBX import - mismatch in camera rotation (bad rotation order).v2.75
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
-rw-r--r--io_scene_fbx/import_fbx.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index 7a2808db..3124e8da 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