[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28792] trunk/blender/source/blender/ editors/transform: [#22114] Manipulator Transform Orientation not respected

[Martin Poirier]

Revision: 28792
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28792
Author:   theeth
Date:     2010-05-16 19:01:05 +0200 (Sun, 16 May 2010)

Log Message:
-----------
[#22114] Manipulator Transform Orientation not respected

Potential fix (the error would explain the gimbal case, not the normal case. Also, it doesn't explain why it worked from time to time on other platforms).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_generics.c
    trunk/blender/source/blender/editors/transform/transform_orientations.c

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2010-05-16 16:28:50 UTC (rev 28791)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2010-05-16 17:01:05 UTC (rev 28792)
@@ -960,7 +960,7 @@
 		{
 			t->current_orientation = RNA_enum_get(op->ptr, "constraint_orientation");
 			
-			if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C) - 1)
+			if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C))
 			{
 				t->current_orientation = V3D_MANIP_GLOBAL;
 			}

Modified: trunk/blender/source/blender/editors/transform/transform_orientations.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_orientations.c	2010-05-16 16:28:50 UTC (rev 28791)
+++ trunk/blender/source/blender/editors/transform/transform_orientations.c	2010-05-16 17:01:05 UTC (rev 28792)
@@ -517,6 +517,7 @@
 	case V3D_MANIP_GIMBAL:
 		unit_m3(t->spacemtx);
 		if (gimbal_axis(ob, t->spacemtx)) {
+			strcpy(t->spacename, "gimbal");
 			break;
 		}
 		/* no gimbal fallthrough to normal */