[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36856] trunk/blender/release/scripts/ modules/bpy_extras/io_utils.py: bpy_extras.io_utils.axis_conversion() was returning wrong matrix.

[Campbell Barton]

Revision: 36856
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36856
Author:   campbellbarton
Date:     2011-05-24 08:11:51 +0000 (Tue, 24 May 2011)
Log Message:
-----------
bpy_extras.io_utils.axis_conversion() was returning wrong matrix.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy_extras/io_utils.py

Modified: trunk/blender/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/io_utils.py	2011-05-24 07:52:29 UTC (rev 36855)
+++ trunk/blender/release/scripts/modules/bpy_extras/io_utils.py	2011-05-24 08:11:51 UTC (rev 36856)
@@ -140,7 +140,8 @@
     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])