Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-05-24 12:11:51 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-05-24 12:11:51 +0400
commit4a989282d44bf578af65e52e7e9d5f3ec3036b2f (patch)
tree4bca7b577621d1c98bbcc7c6565c43bffd3ae97b /release
parent2ccdcca7f5ed5af1ab416dd7900299cb35e29536 (diff)
bpy_extras.io_utils.axis_conversion() was returning wrong matrix.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/modules/bpy_extras/io_utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py
index 820d7cfa39d..dcc5d9ecec0 100644
--- a/release/scripts/modules/bpy_extras/io_utils.py
+++ b/release/scripts/modules/bpy_extras/io_utils.py
@@ -140,7 +140,8 @@ def axis_conversion(from_forward='Y', from_up='Z', to_forward='Y', to_up='Z'):
if from_forward == to_forward and from_up == to_up:
return Matrix().to_3x3()
- value = reduce(int.__or__, (_axis_convert_num[a] << (i * 3) for i, a in enumerate((from_forward, from_up, to_forward, to_up))))
+ value = reduce(int.__or__, (_axis_convert_num[a] << (i * 3) for i, a in enumerate((from_up, from_forward, to_up, to_forward))))
+
for i, axis_lut in enumerate(_axis_convert_lut):
if value in axis_lut:
return Matrix(_axis_convert_matrix[i])