Durian Feature Request: Rotation Modes for Objects

This (biggish) commit generalises the rotation modes functionality added for Bones, allowing Objects to use the various Euler Rotation orders, Axis-Angle, and Quaternion rotation representations.

I've also cleaned up the nomenclature of the rotation-related settings so that the naming styles are more consistent with each other. Unfortunately, this will break all files involving object or bone rotation animation made in 2.5 versions (2.4x will still get correctly converted).

General Notes:
* By default, Objects still default to using Eulers, while Bones will use Quaternions by default still.
* I've fixed all areas that I'm currently aware of to work with these changes. However, there are probably a few places where I've missed a few changes (i.e. auto-keyframing will need attention later).
* Removed the old "IPO-Keys" stuff from Transform code. I'm unlikely to restore this in the near future, and trying to fix that to include support for this commit would have been too much work.

1 files changed, 123 insertions, 153 deletions

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index ea5653dc130..88469794e5d 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -125,19 +125,19 @@ void getViewVector(TransInfo *t, float coord[3], float vec[3])
 	if (t->persp != V3D_ORTHO)
 	{
 		float p1[4], p2[4];
-
+		
 		VECCOPY(p1, coord);
 		p1[3] = 1.0f;
 		VECCOPY(p2, p1);
 		p2[3] = 1.0f;
 		Mat4MulVec4fl(t->viewmat, p2);
-
+		
 		p2[0] = 2.0f * p2[0];
 		p2[1] = 2.0f * p2[1];
 		p2[2] = 2.0f * p2[2];
-
+		
 		Mat4MulVec4fl(t->viewinv, p2);
-
+		
 		VecSubf(vec, p1, p2);
 	}
 	else {
@@ -153,11 +153,11 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 	ModifierData *md= ob->modifiers.first;
 	float tolerance[3] = {0.0f, 0.0f, 0.0f};
 	int axis = 0;
-
+	
 	for (; md; md=md->next) {
 		if (md->type==eModifierType_Mirror) {
 			MirrorModifierData *mmd = (MirrorModifierData*) md;
-
+			
 			if(mmd->flag & MOD_MIR_CLIPPING) {
 				axis = 0;
 				if(mmd->flag & MOD_MIR_AXIS_X) {
@@ -176,35 +176,35 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 					float mtx[4][4], imtx[4][4];
 					int i;
 					TransData *td = t->data;
-
+					
 					if (mmd->mirror_ob) {
 						float obinv[4][4];
-
+						
 						Mat4Invert(obinv, mmd->mirror_ob->obmat);
 						Mat4MulMat4(mtx, ob->obmat, obinv);
 						Mat4Invert(imtx, mtx);
 					}
-
+					
 					for(i = 0 ; i < t->total; i++, td++) {
 						int clip;
 						float loc[3], iloc[3];
-
+						
 						if (td->flag & TD_NOACTION)
 							break;
 						if (td->loc==NULL)
 							break;
-
+						
 						if (td->flag & TD_SKIP)
 							continue;
-
+						
 						VecCopyf(loc,  td->loc);
 						VecCopyf(iloc, td->iloc);
-
+						
 						if (mmd->mirror_ob) {
 							VecMat4MulVecfl(loc, mtx, loc);
 							VecMat4MulVecfl(iloc, mtx, iloc);
 						}
-
+						
 						clip = 0;
 						if(axis & 1) {
 							if(fabs(iloc[0])<=tolerance[0] ||
@@ -213,7 +213,7 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 								clip = 1;
 							}
 						}
-
+						
 						if(axis & 2) {
 							if(fabs(iloc[1])<=tolerance[1] ||
 							   loc[1]*iloc[1]<0.0f) {
@@ -236,7 +236,7 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 						}
 					}
 				}
-
+				
 			}
 		}
 	}
@@ -248,7 +248,7 @@ static void editmesh_apply_to_mirror(TransInfo *t)
 	TransData *td = t->data;
 	EditVert *eve;
 	int i;
-
+	
 	for(i = 0 ; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
@@ -256,7 +256,7 @@ static void editmesh_apply_to_mirror(TransInfo *t)
 			break;
 		if (td->flag & TD_SKIP)
 			continue;
-
+		
 		eve = td->extra;
 		if(eve) {
 			eve->co[0]= -td->loc[0];
@@ -620,9 +620,9 @@ void recalcData(TransInfo *t)
 		if ELEM(t->obedit->type, OB_CURVE, OB_SURF) {
 			Curve *cu= t->obedit->data;
 			Nurb *nu= cu->editnurb->first;
-
+			
 			DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);  /* sets recalc flags */
-
+			
 			if (t->state == TRANS_CANCEL) {
 				while(nu) {
 					calchandlesNurb(nu); /* Cant do testhandlesNurb here, it messes up the h1 and h2 flags */
@@ -648,11 +648,11 @@ void recalcData(TransInfo *t)
 		else if (t->obedit->type == OB_MESH) {
 			if(t->spacetype==SPACE_IMAGE) {
 				SpaceImage *sima= t->sa->spacedata.first;
-
+				
 				flushTransUVs(t);
 				if(sima->flag & SI_LIVE_UNWRAP)
 					ED_uvedit_live_unwrap_re_solve();
-
+				
 				DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);
 			} else {
 				EditMesh *em = ((Mesh*)t->obedit->data)->edit_mesh;
@@ -667,9 +667,9 @@ void recalcData(TransInfo *t)
 				}
 				if((t->options & CTX_NO_MIRROR) == 0 && (t->flag & T_MIRROR))
 					editmesh_apply_to_mirror(t);
-
+					
 				DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);  /* sets recalc flags */
-
+				
 				recalc_editnormals(em);
 			}
 		}
@@ -679,10 +679,10 @@ void recalcData(TransInfo *t)
 			EditBone *ebo;
 			TransData *td = t->data;
 			int i;
-
+			
 			/* Ensure all bones are correctly adjusted */
 			for (ebo = edbo->first; ebo; ebo = ebo->next){
-
+				
 				if ((ebo->flag & BONE_CONNECTED) && ebo->parent){
 					/* If this bone has a parent tip that has been moved */
 					if (ebo->parent->flag & BONE_TIPSEL){
@@ -695,7 +695,7 @@ void recalcData(TransInfo *t)
 						if(t->mode==TFM_BONE_ENVELOPE) ebo->parent->rad_tail= ebo->rad_head;
 					}
 				}
-
+				
 				/* on extrude bones, oldlength==0.0f, so we scale radius of points */
 				ebo->length= VecLenf(ebo->head, ebo->tail);
 				if(ebo->oldlength==0.0f) {
@@ -715,8 +715,8 @@ void recalcData(TransInfo *t)
 					ebo->oldlength= ebo->length;
 				}
 			}
-
-
+			
+			
 			if (t->mode != TFM_BONE_ROLL)
 			{
 				/* fix roll */
@@ -726,10 +726,10 @@ void recalcData(TransInfo *t)
 					{
 						float vec[3], up_axis[3];
 						float qrot[4];
-
+						
 						ebo = td->extra;
 						VECCOPY(up_axis, td->axismtx[2]);
-
+						
 						if (t->mode != TFM_ROTATION)
 						{
 							VecSubf(vec, ebo->tail, ebo->head);
@@ -741,15 +741,15 @@ void recalcData(TransInfo *t)
 						{
 							Mat3MulVecfl(t->mat, up_axis);
 						}
-
+						
 						ebo->roll = ED_rollBoneToVector(ebo, up_axis);
 					}
 				}
 			}
-
+			
 			if(arm->flag & ARM_MIRROR_EDIT)
 				transform_armature_mirror_update(t->obedit);
-
+			
 		}
 		else
 			DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA);  /* sets recalc flags */
@@ -757,7 +757,7 @@ void recalcData(TransInfo *t)
 	else if( (t->flag & T_POSE) && t->poseobj) {
 		Object *ob= t->poseobj;
 		bArmature *arm= ob->data;
-
+		
 		/* if animtimer is running, and the object already has animation data,
 		 * check if the auto-record feature means that we should record 'samples'
 		 * (i.e. uneditable animation values)
@@ -769,7 +769,7 @@ void recalcData(TransInfo *t)
 			animrecord_check_state(t->scene, &ob->id, t->animtimer);
 			autokeyframe_pose_cb_func(t->scene, (View3D *)t->view, ob, t->mode, targetless_ik);
 		}
-
+		
 		/* old optimize trick... this enforces to bypass the depgraph */
 		if (!(arm->flag & ARM_DELAYDEFORM)) {
 			DAG_id_flush_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
@@ -780,13 +780,13 @@ void recalcData(TransInfo *t)
 	else {
 		for(base= FIRSTBASE; base; base= base->next) {
 			Object *ob= base->object;
-
+			
 			/* this flag is from depgraph, was stored in initialize phase, handled in drawview.c */
 			if(base->flag & BA_HAS_RECALC_OB)
 				ob->recalc |= OB_RECALC_OB;
 			if(base->flag & BA_HAS_RECALC_DATA)
 				ob->recalc |= OB_RECALC_DATA;
-
+			
 			/* if object/base is selected */
 			if ((base->flag & SELECT) || (ob->flag & SELECT)) {
 				/* if animtimer is running, and the object already has animation data,
@@ -799,7 +799,7 @@ void recalcData(TransInfo *t)
 					autokeyframe_ob_cb_func(t->scene, (View3D *)t->view, ob, t->mode);
 				}
 			}
-
+			
 			/* proxy exception */
 			if(ob->proxy)
 				ob->proxy->recalc |= ob->recalc;
@@ -807,7 +807,7 @@ void recalcData(TransInfo *t)
 				group_tag_recalc(ob->proxy_group->dup_group);
 		}
 	}
-
+	
 	/* update shaded drawmode while transform */
 	if(t->spacetype==SPACE_VIEW3D && ((View3D*)t->view)->drawtype == OB_SHADED)
 		reshadeall_displist(t->scene);
@@ -821,18 +821,18 @@ void drawLine(TransInfo *t, float *center, float *dir, char axis, short options)
 	if (t->spacetype == SPACE_VIEW3D)
 	{
 		View3D *v3d = t->view;
-
+		
 		glPushMatrix();
-
+		
 		//if(t->obedit) glLoadMatrixf(t->obedit->obmat);	// sets opengl viewing
-
-
+		
+		
 		VecCopyf(v3, dir);
 		VecMulf(v3, v3d->far);
-
+		
 		VecSubf(v2, center, v3);
 		VecAddf(v1, center, v3);
-
+		
 		if (options & DRAWLIGHT) {
 			col[0] = col[1] = col[2] = 220;
 		}
@@ -841,13 +841,13 @@ void drawLine(TransInfo *t, float *center, float *dir, char axis, short options)
 		}
 		UI_make_axis_color(col, col2, axis);
 		glColor3ubv((GLubyte *)col2);
-
+		
 		setlinestyle(0);
 		glBegin(GL_LINE_STRIP);
 			glVertex3fv(v1);
 			glVertex3fv(v2);
 		glEnd();
-
+		
 		glPopMatrix();
 	}
 }
@@ -864,33 +864,33 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 	ARegion *ar = CTX_wm_region(C);
 	ScrArea *sa = CTX_wm_area(C);
 	Object *obedit = CTX_data_edit_object(C);
-
+	
 	/* moving: is shown in drawobject() (transform color) */
 //  TRANSFORM_FIX_ME
 //	if(obedit || (t->flag & T_POSE) ) G.moving= G_TRANSFORM_EDIT;
 //	else if(G.f & G_PARTICLEEDIT) G.moving= G_TRANSFORM_PARTICLE;
 //	else G.moving= G_TRANSFORM_OBJ;
-
+	
 	t->scene = sce;
 	t->sa = sa;
 	t->ar = ar;
 	t->obedit = obedit;
 	t->settings = ts;
-
+	
 	t->data = NULL;
 	t->ext = NULL;
-
+	
 	t->helpline = HLP_NONE;
-
+	
 	t->flag = 0;
-
+	
 	t->redraw = 1; /* redraw first time */
-
+	
 	if (event)
 	{
 		t->imval[0] = event->x - t->ar->winrct.xmin;
 		t->imval[1] = event->y - t->ar->winrct.ymin;
-
+		
 		t->event_type = event->type;
 	}
 	else
@@ -898,45 +898,45 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 		t->imval[0] = 0;
 		t->imval[1] = 0;
 	}
-
+	
 	t->con.imval[0] = t->imval[0];
 	t->con.imval[1] = t->imval[1];
-
+	
 	t->mval[0] = t->imval[0];
 	t->mval[1] = t->imval[1];
-
+	
 	t->transform		= NULL;
 	t->handleEvent		= NULL;
-
+	
 	t->total			= 0;
-
+	
 	t->val = 0.0f;
-
+	
 	t->vec[0]			=
 		t->vec[1]		=
 		t->vec[2]		= 0.0f;
-
+	
 	t->center[0]		=
 		t->center[1]	=
 		t->center[2]	= 0.0f;
-
+	
 	Mat3One(t->mat);
-
+	
 	t->spacetype = sa->spacetype;
 	if(t->spacetype == SPACE_VIEW3D)
 	{
 		View3D *v3d = sa->spacedata.first;
-
+		
 		t->view = v3d;
 		t->animtimer= CTX_wm_screen(C)->animtimer;
-
+		
 		if(v3d->flag & V3D_ALIGN) t->flag |= T_V3D_ALIGN;
 		t->around = v3d->around;
-
+		
 		if (op && RNA_struct_find_property(op->ptr, "constraint_axis") && RNA_property_is_set(op->ptr, "constraint_orientation"))
 		{
 			t->current_orientation = RNA_enum_get(op->ptr, "constraint_orientation");
-
+			
 			if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C) - 1)
 			{
 				t->current_orientation = V3D_MANIP_GLOBAL;
@@ -958,10 +958,10 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 	{
 		// XXX for now, get View2D  from the active region
 		t->view = &ar->v2d;
-
+		
 		t->around = V3D_CENTER;
 	}
-
+	
 	if (op && RNA_struct_find_property(op->ptr, "mirror") && RNA_property_is_set(op->ptr, "mirror"))
 	{
 		if (RNA_boolean_get(op->ptr, "mirror"))
@@ -977,7 +977,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 			t->flag |= T_MIRROR;
 		}
 	}
-
+	
 	/* setting PET flag only if property exist in operator. Otherwise, assume it's not supported */
 	if (op && RNA_struct_find_property(op->ptr, "proportional"))
 	{
@@ -996,12 +996,12 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 		{
 			if ((t->options & CTX_NO_PET) == 0 && (ts->proportional)) {
 				t->flag |= T_PROP_EDIT;
-
+				
 				if(ts->proportional == 2)
 					t->flag |= T_PROP_CONNECTED;	// yes i know, has to become define
 			}
 		}
-
+		
 		if (op && RNA_struct_find_property(op->ptr, "proportional_size") && RNA_property_is_set(op->ptr, "proportional_size"))
 		{
 			t->prop_size = RNA_float_get(op->ptr, "proportional_size");
@@ -1010,8 +1010,8 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 		{
 			t->prop_size = ts->proportional_size;
 		}
-
-
+		
+		
 		/* TRANSFORM_FIX_ME rna restrictions */
 		if (t->prop_size <= 0)
 		{
@@ -1031,12 +1031,12 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 	{
 		t->options |= CTX_NO_PET;
 	}
-
-
+	
+	
 	setTransformViewMatrices(t);
 	initNumInput(&t->num);
 	initNDofInput(&t->ndof);
-
+	
 	return 1;
 }
 
@@ -1044,20 +1044,20 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 void postTrans (TransInfo *t)
 {
 	TransData *td;
-
+	
 	if (t->draw_handle)
 	{
 		ED_region_draw_cb_exit(t->ar->type, t->draw_handle);
 	}
-
+	
 	/* postTrans can be called when nothing is selected, so data is NULL already */
 	if (t->data) {
 		int a;
-
+		
 		/* since ipokeys are optional on objects, we mallocced them per trans-data */
 		for(a=0, td= t->data; a<t->total; a++, td++) {
-			if(td->tdi) MEM_freeN(td->tdi);
-			if (td->flag & TD_BEZTRIPLE) MEM_freeN(td->hdata);
+			if (td->flag & TD_BEZTRIPLE) 
+				MEM_freeN(td->hdata);
 		}
 		MEM_freeN(t->data);
 	}
@@ -1067,20 +1067,18 @@ void postTrans (TransInfo *t)
 		MEM_freeN(t->data2d);
 		t->data2d= NULL;
 	}
-
+	
 	if(t->spacetype==SPACE_IMAGE) {
 		SpaceImage *sima= t->sa->spacedata.first;
 		if(sima->flag & SI_LIVE_UNWRAP)
 			ED_uvedit_live_unwrap_end(t->state == TRANS_CANCEL);
 	}
-	else if(ELEM(t->spacetype, SPACE_ACTION, SPACE_NLA)) {
-	}
-
+	
 	if (t->mouse.data)
 	{
 		MEM_freeN(t->mouse.data);
 	}
-
+	
 	if (t->customFree) {
 		t->customFree(t);
 	}
@@ -1092,7 +1090,7 @@ void postTrans (TransInfo *t)
 void applyTransObjects(TransInfo *t)
 {
 	TransData *td;
-
+	
 	for (td = t->data; td < t->data + t->total; td++) {
 		VECCOPY(td->iloc, td->loc);
 		if (td->ext->rot) {
@@ -1105,16 +1103,6 @@ void applyTransObjects(TransInfo *t)
 	recalcData(t);
 }
 
-/* helper for below */
-static void restore_ipokey(float *poin, float *old)
-{
-	if(poin) {
-		poin[0]= old[0];
-		poin[-3]= old[3];
-		poin[3]= old[6];
-	}
-}
-
 static void restoreElement(TransData *td) {
 	/* TransData for crease has no loc */
 	if (td->loc) {
@@ -1130,45 +1118,27 @@ static void restoreElement(TransData *td) {
 		if (td->ext->size) {
 			VECCOPY(td->ext->size, td->ext->isize);
 		}
-		if(td->flag & TD_USEQUAT) {
-			if (td->ext->quat) {
-				QUATCOPY(td->ext->quat, td->ext->iquat);
-			}
+		if (td->ext->quat) {
+			QUATCOPY(td->ext->quat, td->ext->iquat);
 		}
 	}
-
+	
 	if (td->flag & TD_BEZTRIPLE) {
 		*(td->hdata->h1) = td->hdata->ih1;
 		*(td->hdata->h2) = td->hdata->ih2;
 	}
-
-	if(td->tdi) {
-		TransDataIpokey *tdi= td->tdi;
-
-		restore_ipokey(tdi->locx, tdi->oldloc);
-		restore_ipokey(tdi->locy, tdi->oldloc+1);
-		restore_ipokey(tdi->locz, tdi->oldloc+2);
-
-		restore_ipokey(tdi->rotx, tdi->oldrot);
-		restore_ipokey(tdi->roty, tdi->oldrot+1);
-		restore_ipokey(tdi->rotz, tdi->oldrot+2);
-
-		restore_ipokey(tdi->sizex, tdi->oldsize);
-		restore_ipokey(tdi->sizey, tdi->oldsize+1);
-		restore_ipokey(tdi->sizez, tdi->oldsize+2);
-	}
 }
 
 void restoreTransObjects(TransInfo *t)
 {
 	TransData *td;
-
+	
 	for (td = t->data; td < t->data + t->total; td++) {
 		restoreElement(td);
 	}
-
+	
 	Mat3One(t->mat);
-
+	
 	recalcData(t);
 }
 
@@ -1177,7 +1147,7 @@ void calculateCenter2D(TransInfo *t)
 	if (t->flag & (T_EDIT|T_POSE)) {
 		Object *ob= t->obedit?t->obedit:t->poseobj;
 		float vec[3];
-
+		
 		VECCOPY(vec, t->center);
 		Mat4MulVecfl(ob->obmat, vec);
 		projectIntView(t, vec, t->center2d);
@@ -1190,21 +1160,21 @@ void calculateCenter2D(TransInfo *t)
 void calculateCenterCursor(TransInfo *t)
 {
 	float *cursor;
-
+	
 	cursor = give_cursor(t->scene, t->view);
 	VECCOPY(t->center, cursor);
-
+	
 	/* If edit or pose mode, move cursor in local space */
 	if (t->flag & (T_EDIT|T_POSE)) {
 		Object *ob = t->obedit?t->obedit:t->poseobj;
 		float mat[3][3], imat[3][3];
-
+		
 		VecSubf(t->center, t->center, ob->obmat[3]);
 		Mat3CpyMat4(mat, ob->obmat);
 		Mat3Inv(imat, mat);
 		Mat3MulVecfl(imat, t->center);
 	}
-
+	
 	calculateCenter2D(t);
 }
 
@@ -1212,15 +1182,15 @@ void calculateCenterCursor2D(TransInfo *t)
 {
 	View2D *v2d= t->view;
 	float aspx=1.0, aspy=1.0;
-
+	
 	if(t->spacetype==SPACE_IMAGE) /* only space supported right now but may change */
 		ED_space_image_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
-
+	
 	if (v2d) {
 		t->center[0] = v2d->cursor[0] * aspx;
 		t->center[1] = v2d->cursor[1] * aspy;
 	}
-
+	
 	calculateCenter2D(t);
 }
 
@@ -1229,7 +1199,7 @@ void calculateCenterMedian(TransInfo *t)
 	float partial[3] = {0.0f, 0.0f, 0.0f};
 	int total = 0;
 	int i;
-
+	
 	for(i = 0; i < t->total; i++) {
 		if (t->data[i].flag & TD_SELECTED) {
 			if (!(t->data[i].flag & TD_NOCENTER))
@@ -1249,7 +1219,7 @@ void calculateCenterMedian(TransInfo *t)
 	if(i)
 		VecMulf(partial, 1.0f / total);
 	VECCOPY(t->center, partial);
-
+	
 	calculateCenter2D(t);
 }
 
@@ -1279,7 +1249,7 @@ void calculateCenterBound(TransInfo *t)
 	}
 	VecAddf(t->center, min, max);
 	VecMulf(t->center, 0.5);
-
+	
 	calculateCenter2D(t);
 }
 
@@ -1315,7 +1285,7 @@ void calculateCenter(TransInfo *t)
 			break;
 		} /* END EDIT MODE ACTIVE ELEMENT */
 #endif
-
+		
 		calculateCenterMedian(t);
 		if((t->flag & (T_EDIT|T_POSE))==0)
 		{
@@ -1327,10 +1297,10 @@ void calculateCenter(TransInfo *t)
 				projectIntView(t, t->center, t->center2d);
 			}
 		}
-
+		
 		}
 	}
-
+	
 	/* setting constraint center */
 	VECCOPY(t->con.center, t->center);
 	if(t->flag & (T_EDIT|T_POSE))
@@ -1338,8 +1308,8 @@ void calculateCenter(TransInfo *t)
 		Object *ob= t->obedit?t->obedit:t->poseobj;
 		Mat4MulVecfl(ob->obmat, t->con.center);
 	}
-
-	/* voor panning from cameraview */
+	
+	/* for panning from cameraview */
 	if(t->flag & T_OBJECT)
 	{
 		if(t->spacetype==SPACE_VIEW3D && t->ar->regiontype == RGN_TYPE_WINDOW)
@@ -1347,21 +1317,21 @@ void calculateCenter(TransInfo *t)
 			View3D *v3d = t->view;
 			Scene *scene = t->scene;
 			RegionView3D *rv3d = t->ar->regiondata;
-
+			
 			if(v3d->camera == OBACT && rv3d->persp==V3D_CAMOB)
 			{
 				float axis[3];
 				/* persinv is nasty, use viewinv instead, always right */
 				VECCOPY(axis, t->viewinv[2]);
 				Normalize(axis);
-
+				
 				/* 6.0 = 6 grid units */
 				axis[0]= t->center[0]- 6.0f*axis[0];
 				axis[1]= t->center[1]- 6.0f*axis[1];
 				axis[2]= t->center[2]- 6.0f*axis[2];
-
+				
 				projectIntView(t, axis, t->center2d);
-
+				
 				/* rotate only needs correct 2d center, grab needs initgrabz() value */
 				if(t->mode==TFM_TRANSLATION)
 				{
@@ -1371,14 +1341,14 @@ void calculateCenter(TransInfo *t)
 			}
 		}
 	}
-
+	
 	if(t->spacetype==SPACE_VIEW3D)
 	{
 		/* initgrabz() defines a factor for perspective depth correction, used in window_to_3d_delta() */
 		if(t->flag & (T_EDIT|T_POSE)) {
 			Object *ob= t->obedit?t->obedit:t->poseobj;
 			float vec[3];
-
+			
 			VECCOPY(vec, t->center);
 			Mat4MulVecfl(ob->obmat, vec);
 			initgrabz(t->ar->regiondata, vec[0], vec[1], vec[2]);
@@ -1418,7 +1388,7 @@ void calculatePropRatio(TransInfo *t)
 				/* Use rdist for falloff calculations, it is the real distance */
 				td->flag &= ~TD_NOACTION;
 				dist= (t->prop_size-td->rdist)/t->prop_size;
-
+				
 				/*
 				 * Clamp to positive numbers.
 				 * Certain corner cases with connectivity and individual centers
@@ -1426,7 +1396,7 @@ void calculatePropRatio(TransInfo *t)
 				 */
 				if (dist < 0.0f)
 					dist = 0.0f;
-
+				
 				switch(t->prop_mode) {
 				case PROP_SHARP:
 					td->factor= dist*dist;
@@ -1493,20 +1463,20 @@ float get_drawsize(ARegion *ar, float *co)
 {
 	RegionView3D *rv3d= ar->regiondata;
 	float size, vec[3], len1, len2;
-
+	
 	/* size calculus, depending ortho/persp settings, like initgrabz() */
 	size= rv3d->persmat[0][3]*co[0]+ rv3d->persmat[1][3]*co[1]+ rv3d->persmat[2][3]*co[2]+ rv3d->persmat[3][3];
-
+	
 	VECCOPY(vec, rv3d->persinv[0]);
 	len1= Normalize(vec);
 	VECCOPY(vec, rv3d->persinv[1]);
 	len2= Normalize(vec);
-
+	
 	size*= 0.01f*(len1>len2?len1:len2);
-
+	
 	/* correct for window size to make widgets appear fixed size */
 	if(ar->winx > ar->winy) size*= 1000.0f/(float)ar->winx;
 	else size*= 1000.0f/(float)ar->winy;
-
+	
 	return size;
 }