- Simplified EulToGimbalAxis, its still only works on XYZ and ZXY but at least its more clear whats going on.

- Made RotOrderInfo use a vector rather then i/j/k
- Added gimbal_axis to transform.h (was extern)

3 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 819cb95d948..ae4b1f446da 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -535,6 +535,7 @@ void flushTransNodes(TransInfo *t);
 void flushTransSeq(TransInfo *t);
 
 /*********************** exported from transform_manipulator.c ********** */
+void gimbal_axis(struct Object *ob, float gmat[][3]);
 int calc_manipulator_stats(const struct bContext *C);
 float get_drawsize(struct ARegion *ar, float *co);
 
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 51a820dcdcb..4d48c2c0158 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -181,7 +181,7 @@ static int test_rotmode_euler(short rotmode)
 	return (ELEM(rotmode, ROT_MODE_AXISANGLE, ROT_MODE_QUAT)) ? 0:1;
 }
 
-void gimbalAxis(Object *ob, float gmat[][3])
+void gimbal_axis(Object *ob, float gmat[][3])
 {
 	if(ob->mode & OB_MODE_POSE)
 	{
@@ -475,7 +475,7 @@ int calc_manipulator_stats(const bContext *C)
 		{
 			float mat[3][3];
 			Mat3One(mat);
-			gimbalAxis(ob, mat);
+			gimbal_axis(ob, mat);
 			Mat4CpyMat3(rv3d->twmat, mat);
 			break;
 		}
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index efcaedd2fe1..56160d66e25 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -510,7 +510,6 @@ static int count_bone_select(bArmature *arm, ListBase *lb, int do_it)
 	return total;
 }
 
-extern void gimbalAxis(Object *ob, float gimbal_vecs[][3]);
 void initTransformOrientation(bContext *C, TransInfo *t)
 {
 	View3D *v3d = CTX_wm_view3d(C);
@@ -528,7 +527,7 @@ void initTransformOrientation(bContext *C, TransInfo *t)
 	case V3D_MANIP_GIMBAL:
 		Mat3One(t->spacemtx);
 		if(ob)
-			gimbalAxis(ob, t->spacemtx);
+			gimbal_axis(ob, t->spacemtx);
 		break;
 	case V3D_MANIP_NORMAL:
 		if(obedit || (ob && ob->mode & OB_MODE_POSE)) {