3 files changed, 10 insertions, 13 deletions

diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 58ad171ee20..68c9a2c06cd 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -451,10 +451,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[
 			}
 			
 			
-			/* derive the rotation from the average normal: 
-			 *		- code taken from transform_manipulator.c, 
-			 *			calc_manipulator_stats, V3D_MANIP_NORMAL case
-			 */
+			/* derive the rotation from the average normal */
 			/*	we need the transpose of the inverse for a normal... */
 			copy_m3_m4(imat, ob->obmat);
 			
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index cc88254af3a..c0540192422 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1472,7 +1472,7 @@ void BKE_object_scale_to_mat3(Object *ob, float mat[3][3])
 	size_to_mat3(mat, vec);
 }
 
-void BKE_object_rot_to_mat3(Object *ob, float mat[3][3], bool use_drot)
+void BKE_object_rot_to_mat3(const Object *ob, float r_mat[3][3], bool use_drot)
 {
 	float rmat[3][3], dmat[3][3];
 	
@@ -1504,9 +1504,9 @@ void BKE_object_rot_to_mat3(Object *ob, float mat[3][3], bool use_drot)
 	
 	/* combine these rotations */
 	if (use_drot)
-		mul_m3_m3m3(mat, dmat, rmat);
+		mul_m3_m3m3(r_mat, dmat, rmat);
 	else
-		copy_m3_m3(mat, rmat);
+		copy_m3_m3(r_mat, rmat);
 }
 
 void BKE_object_mat3_to_rot(Object *ob, float mat[3][3], bool use_compat)
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index c5d00d63b6d..a2351a05ff5 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -629,18 +629,18 @@ void BKE_screen_view3d_main_sync(ListBase *screen_lb, Scene *scene)
 	}
 }
 
-void BKE_screen_view3d_twmode_remove(View3D *v3d, const int i)
+void BKE_screen_view3d_transform_orientation_remove(View3D *v3d, const int i)
 {
-	const int selected_index = (v3d->twmode - V3D_MANIP_CUSTOM);
+	const int selected_index = (v3d->transform_orientation - V3D_TRANS_ORIENTATION_CUSTOM);
 	if (selected_index == i) {
-		v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global	*/
+		v3d->transform_orientation = V3D_TRANS_ORIENTATION_GLOBAL; /* fallback to global	*/
 	}
 	else if (selected_index > i) {
-		v3d->twmode--;
+		v3d->transform_orientation--;
 	}
 }
 
-void BKE_screen_view3d_main_twmode_remove(ListBase *screen_lb, Scene *scene, const int i)
+void BKE_screen_view3d_main_transform_orientation_remove(ListBase *screen_lb, Scene *scene, const int i)
 {
 	bScreen *sc;
 
@@ -652,7 +652,7 @@ void BKE_screen_view3d_main_twmode_remove(ListBase *screen_lb, Scene *scene, con
 				for (sl = sa->spacedata.first; sl; sl = sl->next) {
 					if (sl->spacetype == SPACE_VIEW3D) {
 						View3D *v3d = (View3D *)sl;
-						BKE_screen_view3d_twmode_remove(v3d, i);
+						BKE_screen_view3d_transform_orientation_remove(v3d, i);
 					}
 				}
 			}