Merged all the internal transform includes into transform.h and moves it to /src to /include.

Split the conversion fonctions and sorting functions from transform.c into transform_conversions.c
Update MSVC 6.0 projectiles and SConscript accordingly.
Editview still included transform.h, replaced that for BIF_transform.h, the external include.

13 files changed, 1668 insertions, 1678 deletions

diff --git a/projectfiles/blender/src/BL_src.dsp b/projectfiles/blender/src/BL_src.dsp
index bfc0dd85855..ccdb083ea82 100644
--- a/projectfiles/blender/src/BL_src.dsp
+++ b/projectfiles/blender/src/BL_src.dsp
@@ -643,18 +643,6 @@ SOURCE=..\..\..\source\blender\src\transform.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\source\blender\src\transform_constraints.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform_generics.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\source\blender\src\transform_numinput.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\source\blender\src\winlay.h
 # End Source File
 # End Group
diff --git a/source/blender/src/transform.h b/source/blender/include/transform.h
index 1630d29b02b..7e54132939d 100755
--- a/source/blender/src/transform.h
+++ b/source/blender/include/transform.h
@@ -33,13 +33,30 @@
 #ifndef TRANSFORM_H
 #define TRANSFORM_H
 
-#include "transform_numinput.h"
 #include "BIF_transform.h"
 
 /* ************************** Types ***************************** */
 
 struct TransInfo;
 struct TransData;
+struct NumInput;
+
+typedef struct NumInput {
+    short  idx;
+    short  idx_max;
+    short  flag;        /* Different flags to indicate different behaviors                                */
+    float  val[3];       /* Direct value of the input                                                      */
+    short  ctrl[3];      /* Control to indicate what to do with the numbers that are typed                 */
+} NumInput ;
+
+/*
+	The ctrl value has different meaning:
+		0			: No value has been typed
+		
+		otherwise, |value| - 1 is where the cursor is located after the period
+		Positive	: number is positive
+		Negative	: number is negative
+*/
 
 typedef struct TransCon {
     char  text[50];      /* Description of the Constraint for header_print                            */
@@ -217,12 +234,86 @@ int Crease(TransInfo *t, short mval[2]);
 
 /* exported from transform.c */
 struct ListBase;
-void count_bone_select(struct ListBase *lb, int *counter);
+void count_bone_select(TransInfo *t, struct ListBase *lb, int *counter);
 
 /* exported from transform_manipulator.c */
 struct ScrArea;
 void draw_manipulator_ext(struct ScrArea *sa, int type, char axis, int col, float vec[3], float mat[][3]);
 
+/*********************** TransData Creation and General Handling */
+void createTransData(TransInfo *t);
+void sort_trans_data_dist(TransInfo *t);
+void clear_trans_object_base_flags(void);
+void add_tdi_poin(float *poin, float *old, float delta);
 
+/*********************** Constraints *****************************/
+void getConstraintMatrix(TransInfo *t);
+void setConstraint(TransInfo *t, float space[3][3], int mode, const char text[]);
+void setLocalConstraint(TransInfo *t, int mode, const char text[]);
+
+void constraintNumInput(TransInfo *t, float vec[3]);
+
+//void drawConstraint(TransCon *t);
+void drawConstraint();
+
+//void drawPropCircle(TransInfo *t);
+void drawPropCircle();
+
+void initConstraint(TransInfo *t);
+void startConstraint(TransInfo *t);
+void stopConstraint(TransInfo *t);
+
+void getConstraintMatrix(TransInfo *t);
+
+void initSelectConstraint(TransInfo *t);
+void selectConstraint(TransInfo *t);
+void postSelectConstraint(TransInfo *t);
+
+int getConstraintSpaceDimension(TransInfo *t);
+
+void setNearestAxis(TransInfo *t);
+
+
+/*********************** Generics ********************************/
+void recalcData(TransInfo *t);
+
+void initTransModeFlags(TransInfo *t, int mode);
+
+void drawLine(float *center, float *dir, char axis, short options);
+
+/* DRAWLINE options flags */
+#define DRAWLIGHT	1
+#define DRAWDASHED	2
+#define DRAWBOLD	4
+
+void applyTransObjects(TransInfo *t);
+void restoreTransObjects(TransInfo *t);
+
+void initTrans(TransInfo *t);
+void postTrans (TransInfo *t);
+
+void calculateCenterBound(TransInfo *t);
+void calculateCenterMedian(TransInfo *t);
+void calculateCenterCursor(TransInfo *t);
+
+void calculateCenter(TransInfo *t);
+
+void calculatePropRatio(TransInfo *t);
+
+void snapGrid(TransInfo *t, float *val);
+
+void getViewVector(float coord[3], float vec[3]);
+
+TransInfo * BIF_GetTransInfo(void);
+
+
+/*********************** NumInput ********************************/
+void outputNumInput(NumInput *n, char *str);
+
+short hasNumInput(NumInput *n);
+
+void applyNumInput(NumInput *n, float *vec);
+
+char handleNumInput(NumInput *n, unsigned short event);
 #endif
 
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index a057f5f5098..166c2a9b133 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -114,6 +114,7 @@ source_files = ['B.blend.c',
                 'transform_generics.c',
                 'transform_numinput.c',
                 'transform_constraints.c',
+                'transform_conversions.c',
                 'transform_manipulator.c',
                 'unwrapper.c',
                 'usiblender.c',
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index 132973d01e0..7caeb5482c9 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -95,7 +95,7 @@
 #include "blendef.h"
 #include "mydevice.h"
 
-#include "transform.h"
+#include "BIF_transform.h"
 
 extern ListBase editNurb; /* originally from exports.h, memory from editcurve.c*/
 /* editmball.c */
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index fb3efe60a5f..9c3f9f6d9a0 100755
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -118,1468 +118,11 @@ extern void helpline(float *vec);
 
 
 #include "transform.h"
-#include "transform_generics.h"
-#include "transform_constraints.h"
-#include "transform_numinput.h"
 
 /* GLOBAL VARIABLE THAT SHOULD MOVED TO SCREEN MEMBER OR SOMETHING  */
 TransInfo Trans;
 int	LastMode = TFM_TRANSLATION;
 
-/* ************************** Functions *************************** */
-
-static void qsort_trans_data(TransInfo *t, TransData *head, TransData *tail) {
-	TransData pivot = *head;
-	TransData *ihead = head;
-	TransData *itail = tail;
-	short connected = t->flag & T_PROP_CONNECTED;
-
-	while (head < tail)
-	{
-		if (connected) {
-			while ((tail->dist >= pivot.dist) && (head < tail))
-				tail--;
-		}
-		else {
-			while ((tail->rdist >= pivot.rdist) && (head < tail))
-				tail--;
-		}
-
-		if (head != tail)
-		{
-			*head = *tail;
-			head++;
-		}
-
-		if (connected) {
-			while ((head->dist <= pivot.dist) && (head < tail))
-				head++;
-		}
-		else {
-			while ((head->rdist <= pivot.rdist) && (head < tail))
-				head++;
-		}
-
-		if (head != tail)
-		{
-			*tail = *head;
-			tail--;
-		}
-	}
-
-	*head = pivot;
-	if (ihead < head) {
-		qsort_trans_data(t, ihead, head-1);
-	}
-	if (itail > head) {
-		qsort_trans_data(t, head+1, itail);
-	}
-}
-
-static void sort_trans_data_dist(TransInfo *t) {
-	TransData *start = t->data;
-	int i = 1;
-
-	while(i < t->total && start->flag & TD_SELECTED) {
-		start++;
-		i++;
-	}
-	qsort_trans_data(t, start, t->data + t->total - 1);
-}
-
-static void sort_trans_data(TransInfo *t) 
-{
-	TransData *sel, *unsel;
-	TransData temp;
-	unsel = t->data;
-	sel = t->data;
-	sel += t->total - 1;
-	while (sel > unsel) {
-		while (unsel->flag & TD_SELECTED) {
-			unsel++;
-			if (unsel == sel) {
-				return;
-			}
-		}
-		while (!(sel->flag & TD_SELECTED)) {
-			sel--;
-			if (unsel == sel) {
-				return;
-			}
-		}
-		temp = *unsel;
-		*unsel = *sel;
-		*sel = temp;
-		sel--;
-		unsel++;
-	}
-}
-
-
-/* distance calculated from not-selected vertex to nearest selected vertex
-   warning; this is loops inside loop, has minor N^2 issues, but by sorting list it is OK */
-static void set_prop_dist(TransInfo *t, short with_dist)
-{
-	TransData *tob;
-	int a;
-	
-	for(a=0, tob= t->data; a<t->total; a++, tob++) {
-		
-		tob->rdist= 0.0f; // init, it was mallocced
-		
-		if((tob->flag & TD_SELECTED)==0) {
-			TransData *td;
-			int i;
-			float dist, vec[3];
-
-			tob->rdist = -1.0f; // signal for next loop
-				
-			for (i = 0, td= t->data; i < t->total; i++, td++) {
-				if(td->flag & TD_SELECTED) {
-					VecSubf(vec, tob->center, td->center);
-					Mat3MulVecfl(tob->mtx, vec);
-					dist = Normalise(vec);
-					if (tob->rdist == -1.0f) {
-						tob->rdist = dist;
-					}
-					else if (dist < tob->rdist) {
-						tob->rdist = dist;
-					}
-				}
-				else break;	// by definition transdata has selected items in beginning
-			}
-			if (with_dist) {
-				tob->dist = tob->rdist;
-			}
-		}	
-	}
-}
-
-/* ************************** CONVERSIONS ************************* */
-
-/* ********************* texture space ********* */
-
-static void createTransTexspace(TransInfo *t)
-{
-	TransData *td;
-	Object *ob;
-	ID *id;
-	
-	ob= OBACT;
-	t->total = 1;
-	td= t->data= MEM_callocN(sizeof(TransData), "TransTexspace");
-	td->ext= t->ext= MEM_callocN(sizeof(TransDataExtension), "TransTexspace");
-	
-	td->flag= TD_SELECTED;
-	VECCOPY(td->center, ob->obmat[3]);
-	td->ob = ob;
-	
-	Mat3CpyMat4(td->mtx, ob->obmat);
-	Mat3Inv(td->smtx, td->mtx);
-	
-	id= ob->data;
-	if(id==0);
-	else if( GS(id->name)==ID_ME) {
-		Mesh *me= ob->data;
-		me->texflag &= ~AUTOSPACE;
-		td->loc= me->loc;
-		td->ext->rot= me->rot;
-		td->ext->size= me->size;
-	}
-	else if( GS(id->name)==ID_CU) {
-		Curve *cu= ob->data;
-		cu->texflag &= ~CU_AUTOSPACE;
-		td->loc= cu->loc;
-		td->ext->rot= cu->rot;
-		td->ext->size= cu->size;
-	}
-	else if( GS(id->name)==ID_MB) {
-		MetaBall *mb= ob->data;
-		mb->texflag &= ~MB_AUTOSPACE;
-		td->loc= mb->loc;
-		td->ext->rot= mb->rot;
-		td->ext->size= mb->size;
-	}
-	
-	VECCOPY(td->iloc, td->loc);
-	VECCOPY(td->ext->irot, td->ext->rot);
-	VECCOPY(td->ext->isize, td->ext->size);
-}
-
-/* ********************* edge (for crease) ***** */
-
-static void createTransEdge(TransInfo *t) {
-	TransData *td = NULL;
-	EditMesh *em = G.editMesh;
-	EditEdge *eed;
-	Mesh *me = G.obedit->data;
-	EditVert **nears = NULL;
-	float *vectors = NULL;
-	float mtx[3][3], smtx[3][3];
-	int count=0, countsel=0;
-	int propmode = t->flag & T_PROP_EDIT;
-
-	/* THIS IS A REALLY STUPID HACK, MUST BE A BETTER WAY TO DO IT */
-	/* this is sufficient to invoke edges added in mesh, but only in editmode */
-	if(me->medge==NULL) {
-		me->medge= MEM_callocN(sizeof(MEdge), "fake medge");
-		me->totedge= 1;
-		allqueue(REDRAWBUTSEDIT, 0);
-	}
-					
-	for(eed= em->edges.first; eed; eed= eed->next) {
-		if(eed->h==0) {
-			if (eed->f & SELECT) countsel++;
-			if (propmode) count++;
-		}
-	}
-
-	if (countsel == 0)
-		return;
-
-	if(propmode) {
-		t->total = count;
-	}
-	else {
-		t->total = countsel;
-	}
-
-	td= t->data= MEM_callocN(t->total * sizeof(TransData), "TransCrease");
-
-	Mat3CpyMat4(mtx, G.obedit->obmat);
-	Mat3Inv(smtx, mtx);
-
-	for(eed= em->edges.first; eed; eed= eed->next) {
-		if(eed->h==0 && (eed->f & SELECT || propmode)) {
-			/* need to set center for center calculations */
-			VecAddf(td->center, eed->v1->co, eed->v2->co);
-			VecMulf(td->center, 0.5f);
-
-			td->loc= NULL;
-			if (eed->f & SELECT)
-				td->flag= TD_SELECTED;
-			else 
-				td->flag= 0;
-
-
-			Mat3CpyMat3(td->smtx, smtx);
-			Mat3CpyMat3(td->mtx, mtx);
-
-			td->ext = NULL;
-			td->tdi = NULL;
-			td->val = &(eed->crease);
-			td->ival = eed->crease;
-
-			td++;
-		}
-	}
-}
-
-/* ********************* pose mode ************* */
-
-/* callback, make sure it's identical structured as next one */
-/* also used to count for manipulator */
-void count_bone_select(ListBase *lb, int *counter) 
-{
-	Bone *bone;
-	int deeper= 1;
-	
-	for(bone= lb->first; bone; bone= bone->next) {
-		if (bone->flag & BONE_SELECTED) {
-			/* We don't let IK children get "grabbed" */
-			/* ALERT! abusive global Trans here */
-			if ( (Trans.mode!=TFM_TRANSLATION) || (bone->flag & BONE_IK_TOPARENT)==0 ) {
-				(*counter)++;
-				deeper= 0;	// no transform on children if one parent bone is selected
-			}
-			else deeper= 1;
-		}
-		if(deeper) count_bone_select( &bone->childbase, counter);
-	}
-}
-
-/* recursive */
-static void add_pose_transdata(ListBase *lb, Object *ob, TransData **tdp)
-{
-	Bone *bone;
-	TransData *td= *tdp;
-	float	parmat[4][4], tempmat[4][4];
-	float tempobmat[4][4];
-	float vec[3];
-	int deeper= 1;
-	
-	for(bone= lb->first; bone; bone= bone->next) {
-		if (bone->flag & BONE_SELECTED) {
-			/* We don't let IK children get "grabbed" */
-			/* ALERT! abusive global Trans here */
-			if ( (Trans.mode!=TFM_TRANSLATION) || (bone->flag & BONE_IK_TOPARENT)==0 ) {
-				
-				get_bone_root_pos (bone, vec, 1);
-				
-				//VecAddf (centroid, centroid, vec);
-				VECCOPY(td->center, vec);
-				
-				td->ob = ob;
-				td->flag= TD_SELECTED|TD_USEQUAT;
-				td->loc = bone->loc;
-				VECCOPY(td->iloc, bone->loc);
-				
-				td->ext->rot= NULL;
-				td->ext->quat= bone->quat;
-				td->ext->size= bone->size;
-				td->ext->bone= bone; //	FIXME: Dangerous
-
-				QUATCOPY(td->ext->iquat, bone->quat);
-				VECCOPY(td->ext->isize, bone->size);
-				
-				/* Get the matrix of this bone minus the usertransform */
-				Mat4CpyMat4 (tempobmat, bone->obmat);
-				Mat4One (bone->obmat);
-				get_objectspace_bone_matrix(bone, tempmat, 1, 1);
-				Mat4CpyMat4 (bone->obmat, tempobmat);
-
-				Mat4MulMat4 (parmat, tempmat, ob->obmat);	/* Original */
-				
-				Mat3CpyMat4 (td->mtx, parmat);
-				Mat3Inv (td->smtx, td->mtx);
-				
-				(*tdp)++;
-				td= *tdp;
-				deeper= 0;
-			}
-			else deeper= 1;
-		}
-		if(deeper) add_pose_transdata(&bone->childbase, ob, tdp);
-	}
-}
-
-static void createTransPose(TransInfo *t)
-{
-	bArmature *arm;
-	TransData *td;
-	TransDataExtension *tdx;
-	int i;
-	
-	/* check validity of state */
-	arm=get_armature (G.obpose);
-	if (arm==NULL) return;
-	
-	if (arm->flag & ARM_RESTPOS){
-		notice ("Transformation not possible while Rest Position is enabled");
-		return;
-	}
-	if (!(G.obpose->lay & G.vd->lay)) return;
-
-	/* copied from old code, no idea. we let linker solve it for now */
-	{
-		extern void figure_bone_nocalc(Object *ob);
-		extern void figure_pose_updating(void);
-
-		/* figure out which bones need calculating */
-		figure_bone_nocalc(G.obpose);
-		figure_pose_updating();
-	}
-	
-	/* copied from old code, no idea... (ton) */
-	apply_pose_armature(arm, G.obpose->pose, 0);
-	where_is_armature (G.obpose);
-	
-	/* count total */
-	count_bone_select(&arm->bonebase, &t->total);
-	
-	if(t->total==0 && t->mode==TFM_TRANSLATION) {
-		t->mode= TFM_ROTATION;
-		count_bone_select(&arm->bonebase, &t->total);
-	}		
-	if(t->total==0) return;
-	
-	/* init trans data */
-    td = t->data = MEM_mallocN(t->total*sizeof(TransData), "TransPoseBone");
-    tdx = t->ext = MEM_mallocN(t->total*sizeof(TransDataExtension), "TransPoseBoneExt");
-	for(i=0; i<t->total; i++, td++, tdx++) {
-		td->ext= tdx;
-		td->tdi = NULL;
-		td->val = NULL;
-	}	
-	/* recursive fill trans data */
-	td= t->data;
-	add_pose_transdata(&arm->bonebase, G.obpose, &td);
-	
-}
-
-/* ********************* armature ************** */
-
-static void createTransArmatureVerts(TransInfo *t)
-{
-	EditBone *ebo;
-	TransData *td;
-	float mtx[3][3], smtx[3][3];
-
-	Trans.total = 0;
-	for (ebo=G.edbo.first;ebo;ebo=ebo->next){
-		if (ebo->flag & BONE_TIPSEL){
-			t->total++;
-		}
-		if (ebo->flag & BONE_ROOTSEL){
-			t->total++;
-		}
-	}
-
-    if (!t->total) return;
-	
-	Mat3CpyMat4(mtx, G.obedit->obmat);
-	Mat3Inv(smtx, mtx);
-
-    td = t->data = MEM_mallocN(t->total*sizeof(TransData), "TransEditBone");
-	
-	for (ebo=G.edbo.first;ebo;ebo=ebo->next){
-		if (ebo->flag & BONE_TIPSEL){
-			VECCOPY (td->iloc, ebo->tail);
-			VECCOPY (td->center, td->iloc);
-			td->loc= ebo->tail;
-			td->flag= TD_SELECTED;
-
-			Mat3CpyMat3(td->smtx, smtx);
-			Mat3CpyMat3(td->mtx, mtx);
-
-			td->ext = NULL;
-			td->tdi = NULL;
-			td->val = NULL;
-
-			td++;
-		}
-		if (ebo->flag & BONE_ROOTSEL){
-			VECCOPY (td->iloc, ebo->head);
-			VECCOPY (td->center, td->iloc);
-			td->loc= ebo->head;
-			td->flag= TD_SELECTED;
-
-			Mat3CpyMat3(td->smtx, smtx);
-			Mat3CpyMat3(td->mtx, mtx);
-
-			td->ext = NULL;
-			td->tdi = NULL;
-			td->val = NULL;
-
-			td++;
-		}
-			
-	}
-}
-
-/* ********************* meta elements ********* */
-
-static void createTransMBallVerts(TransInfo *t)
-{
- 	MetaElem *ml;
-	TransData *td;
-	TransDataExtension *tx;
-	float mtx[3][3], smtx[3][3];
-	int count=0, countsel=0;
-	int propmode = t->flag & T_PROP_EDIT;
-
-	/* count totals */
-	for(ml= editelems.first; ml; ml= ml->next) {
-		if(ml->flag & SELECT) countsel++;
-		if(propmode) count++;
-	}
-
-	/* note: in prop mode we need at least 1 selected */
-	if (countsel==0) return;
-	
-	if(propmode) t->total = count; 
-	else t->total = countsel;
-	
-	td = t->data= MEM_mallocN(t->total*sizeof(TransData), "TransObData(MBall EditMode)");
-	tx = t->ext = MEM_mallocN(t->total*sizeof(TransDataExtension), "MetaElement_TransExtension");
-
-	Mat3CpyMat4(mtx, G.obedit->obmat);
-	Mat3Inv(smtx, mtx);
-    
-	for(ml= editelems.first; ml; ml= ml->next) {
-		if(propmode || (ml->flag & SELECT)) {
-			td->loc= &ml->x;
-			VECCOPY(td->iloc, td->loc);
-			VECCOPY(td->center, td->loc);
-
-			if(ml->flag & SELECT) td->flag= TD_SELECTED | TD_USEQUAT;
-			else td->flag= TD_USEQUAT;
-
-			Mat3CpyMat3(td->smtx, smtx);
-			Mat3CpyMat3(td->mtx, mtx);
-
-			td->ext = tx;
-			td->tdi = NULL;
-			td->val = NULL;
-
-			tx->size = &ml->expx;
-			tx->isize[0] = ml->expx;
-			tx->isize[1] = ml->expy;
-			tx->isize[2] = ml->expz;
-
-			tx->quat = ml->quat;
-			QUATCOPY(tx->iquat, ml->quat);
-
-			tx->rot = NULL;
-
-			td++;
-			tx++;
-		}
-	}
-} 
-
-/* ********************* curve/surface ********* */
-
-static void calc_distanceCurveVerts(TransData *head, TransData *tail) {
-	TransData *td, *td_near = NULL;
-	for (td = head; td<=tail; td++) {
-		if (td->flag & TD_SELECTED) {
-			td_near = td;
-			td->dist = 0.0f;
-		}
-		else if(td_near) {
-			float dist;
-			dist = VecLenf(td_near->center, td->center);
-			if (dist < (td-1)->dist) {
-				td->dist = (td-1)->dist;
-			}
-			else {
-				td->dist = dist;
-			}
-		}
-		else {
-			td->dist = MAXFLOAT;
-			td->flag |= TD_NOTCONNECTED;
-		}
-	}
-	td_near = NULL;
-	for (td = tail; td>=head; td--) {
-		if (td->flag & TD_SELECTED) {
-			td_near = td;
-			td->dist = 0.0f;
-		}
-		else if(td_near) {
-			float dist;
-			dist = VecLenf(td_near->center, td->center);
-			if (td->flag & TD_NOTCONNECTED || dist < td->dist || (td+1)->dist < td->dist) {
-				td->flag &= ~TD_NOTCONNECTED;
-				if (dist < (td+1)->dist) {
-					td->dist = (td+1)->dist;
-				}
-				else {
-					td->dist = dist;
-				}
-			}
-		}
-	}
-}
-
-static void createTransCurveVerts(TransInfo *t)
-{
-	TransData *td = NULL;
-  	Nurb *nu;
-	BezTriple *bezt;
-	BPoint *bp;
-	float mtx[3][3], smtx[3][3];
-	int a;
-	int count=0, countsel=0;
-	int propmode = t->flag & T_PROP_EDIT;
-
-	/* count total of vertices, check identical as in 2nd loop for making transdata! */
-	for(nu= editNurb.first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
-			for(a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
-				if(bezt->hide==0) {
-					if(bezt->f1 & 1) countsel++;
-					if(bezt->f2 & 1) countsel++;
-					if(bezt->f3 & 1) countsel++;
-					if(propmode) count+= 3;
-				}
-			}
-		}
-		else {
-			for(a= nu->pntsu*nu->pntsv, bp= nu->bp; a>0; a--, bp++) {
-				if(bp->hide==0) {
-					if(propmode) count++;
-					if(bp->f1 & 1) countsel++;
-				}
-			}
-		}
-	}
-	/* note: in prop mode we need at least 1 selected */
-	if (countsel==0) return;
-	
-	if(propmode) Trans.total = count; 
-	else t->total = countsel;
-	t->data= MEM_mallocN(t->total*sizeof(TransData), "TransObData(Curve EditMode)");
-
-	Mat3CpyMat4(mtx, G.obedit->obmat);
-	Mat3Inv(smtx, mtx);
-
-    td = t->data;
-	for(nu= editNurb.first; nu; nu= nu->next) {
-		if((nu->type & 7)==CU_BEZIER) {
-			for(a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
-				if(bezt->hide==0) {
-					if(propmode || (bezt->f1 & 1)) {
-						VECCOPY(td->iloc, bezt->vec[0]);
-						td->loc= bezt->vec[0];
-						VECCOPY(td->center, bezt->vec[1]);
-						if(bezt->f1 & 1) td->flag= TD_SELECTED;
-						else td->flag= 0;
-						td->ext = NULL;
-						td->tdi = NULL;
-						td->val = NULL;
-
-						Mat3CpyMat3(td->smtx, smtx);
-						Mat3CpyMat3(td->mtx, mtx);
-
-						td++;
-						count++;
-					}
-					/* THIS IS THE CV, the other two are handles */
-					if(propmode || (bezt->f2 & 1)) {
-						VECCOPY(td->iloc, bezt->vec[1]);
-						td->loc= bezt->vec[1];
-						VECCOPY(td->center, td->loc);
-						if(bezt->f2 & 1) td->flag= TD_SELECTED;
-						else td->flag= 0;
-						td->ext = NULL;
-						td->tdi = NULL;
-						td->val = &(bezt->alfa);
-						td->ival = bezt->alfa;
-
-						Mat3CpyMat3(td->smtx, smtx);
-						Mat3CpyMat3(td->mtx, mtx);
-
-						td++;
-						count++;
-					}
-					if(propmode || (bezt->f3 & 1)) {
-						VECCOPY(td->iloc, bezt->vec[2]);
-						td->loc= bezt->vec[2];
-						VECCOPY(td->center, bezt->vec[1]);
-						if(bezt->f3 & 1) td->flag= TD_SELECTED;
-						else td->flag= 0;
-						td->ext = NULL;
-						td->tdi = NULL;
-						td->val = NULL;
-
-						Mat3CpyMat3(td->smtx, smtx);
-						Mat3CpyMat3(td->mtx, mtx);
-
-						td++;
-						count++;
-					}
-				}
-			}
-			if (propmode)
-				calc_distanceCurveVerts(td-(nu->pntsu*3), td-1);
-		}
-		else {
-			for(a= nu->pntsu*nu->pntsv, bp= nu->bp; a>0; a--, bp++) {
-				if(bp->hide==0) {
-					if(propmode || (bp->f1 & 1)) {
-						VECCOPY(td->iloc, bp->vec);
-						td->loc= bp->vec;
-						VECCOPY(td->center, td->loc);
-						if(bp->f1 & 1) td->flag= TD_SELECTED;
-						else td->flag= 0;
-						td->ext = NULL;
-						td->tdi = NULL;
-						td->val = &(bp->alfa);
-						td->ival = bp->alfa;
-
-						Mat3CpyMat3(td->smtx, smtx);
-						Mat3CpyMat3(td->mtx, mtx);
-
-						td++;
-						count++;
-					}
-				}
-			}
-			if (propmode)
-				calc_distanceCurveVerts(td-(nu->pntsu*nu->pntsv), td-1);
-		}
-	}
-}
-
-/* ********************* lattice *************** */
-
-static void createTransLatticeVerts(TransInfo *t)
-{
-	TransData *td = NULL;
-	BPoint *bp;
-	float mtx[3][3], smtx[3][3];
-	int a;
-	int count=0, countsel=0;
-	int propmode = t->flag & T_PROP_EDIT;
-
-	bp= editLatt->def;
-	a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
-	while(a--) {
-		if(bp->f1 & 1) countsel++;
-		if(propmode) count++;
-		bp++;
-	}
-	
- 	/* note: in prop mode we need at least 1 selected */
-	if (countsel==0) return;
-	
-	if(propmode) t->total = count; 
-	else t->total = countsel;
-	t->data= MEM_mallocN(t->total*sizeof(TransData), "TransObData(Lattice EditMode)");
-	
-	Mat3CpyMat4(mtx, G.obedit->obmat);
-	Mat3Inv(smtx, mtx);
-
-	td = t->data;
-	bp= editLatt->def;
-	a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
-	while(a--) {
-		if(propmode || (bp->f1 & 1)) {
-			if(bp->hide==0) {
-				VECCOPY(td->iloc, bp->vec);
-				td->loc= bp->vec;
-				VECCOPY(td->center, td->loc);
-				if(bp->f1 & 1) td->flag= TD_SELECTED;
-				else td->flag= 0;
-				Mat3CpyMat3(td->smtx, smtx);
-				Mat3CpyMat3(td->mtx, mtx);
-
-				td->ext = NULL;
-				td->tdi = NULL;
-				td->val = NULL;
-
-				td++;
-				count++;
-			}
-		}
-		bp++;
-	}
-} 
-
-/* ********************* mesh ****************** */
-
-/* proportional distance based on connectivity  */
-#define E_VEC(a)	(vectors + (3 * (int)(a)->vn))
-#define E_NEAR(a)	(nears[((int)(a)->vn)])
-static void editmesh_set_connectivity_distance(int total, float *vectors, EditVert **nears)
-{
-	EditMesh *em = G.editMesh;
-	EditVert *eve;
-	EditEdge *eed;
-	int i= 0, done= 1;
-
-	/* f2 flag is used for 'selection' */
-	/* vn is offset on scratch array   */
-	for(eve= em->verts.first; eve; eve= eve->next) {
-		if(eve->h==0) {
-			eve->vn = (EditVert *)(i++);
-
-			if(eve->f & SELECT) {
-				eve->f2= 2;
-				E_NEAR(eve) = eve;
-				E_VEC(eve)[0] = 0.0f;
-				E_VEC(eve)[1] = 0.0f;
-				E_VEC(eve)[2] = 0.0f;
-			}
-			else {
-				eve->f2 = 0;
-			}
-		}
-	}
-
-
-	/* Floodfill routine */
-	/*
-	At worst this is n*n of complexity where n is number of edges 
-	Best case would be n if the list is ordered perfectly.
-	Estimate is n log n in average (so not too bad)
-	*/
-	while(done) {
-		done= 0;
-		
-		for(eed= em->edges.first; eed; eed= eed->next) {
-			if(eed->h==0) {
-				EditVert *v1= eed->v1, *v2= eed->v2;
-				float *vec2 = E_VEC(v2);
-				float *vec1 = E_VEC(v1);
-
-				if (v1->f2 + v2->f2 == 4)
-					continue;
-
-				if (v1->f2) {
-					if (v2->f2) {
-						float nvec[3];
-						float len1 = VecLength(vec1);
-						float len2 = VecLength(vec2);
-						float lenn;
-						/* for v2 if not selected */
-						if (v2->f2 != 2) {
-							VecSubf(nvec, v2->co, E_NEAR(v1)->co);
-							lenn = VecLength(nvec);
-							if (lenn - len1 > 0.00001f && len2 - lenn > 0.00001f) {
-								VECCOPY(vec2, nvec);
-								E_NEAR(v2) = E_NEAR(v1);
-								done = 1;
-							}
-							else if (len2 - len1 > 0.00001f && len1 - lenn > 0.00001f) {
-								VECCOPY(vec2, vec1);
-								E_NEAR(v2) = E_NEAR(v1);
-								done = 1;
-							}
-						}
-						/* for v1 if not selected */
-						if (v1->f2 != 2) {
-							VecSubf(nvec, v1->co, E_NEAR(v2)->co);
-							lenn = VecLength(nvec);
-							if (lenn - len2 > 0.00001f && len1 - lenn > 0.00001f) {
-								VECCOPY(vec1, nvec);
-								E_NEAR(v1) = E_NEAR(v2);
-								done = 1;
-							}
-							else if (len1 - len2 > 0.00001f && len2 - lenn > 0.00001f) {
-								VECCOPY(vec1, vec2);
-								E_NEAR(v1) = E_NEAR(v2);
-								done = 1;
-							}
-						}
-					}
-					else {
-						v2->f2 = 1;
-						VecSubf(vec2, v2->co, E_NEAR(v1)->co);
-						if (VecLength(vec1) - VecLength(vec2) > 0.00001f) {
-							VECCOPY(vec2, vec1);
-						}
-						E_NEAR(v2) = E_NEAR(v1);
-						done = 1;
-					}
-				}
-				else if (v2->f2) {
-					v1->f2 = 1;
-					VecSubf(vec1, v1->co, E_NEAR(v2)->co);
-					if (VecLength(vec2) - VecLength(vec1) > 0.00001f) {
-						VECCOPY(vec1, vec2);
-					}
-					E_NEAR(v1) = E_NEAR(v2);
-					done = 1;
-				}
-			}
-		}
-	}
-}
-
-
-static void VertsToTransData(TransData *td, EditVert *eve)
-{
-	td->flag = 0;
-	td->loc = eve->co;
-	VECCOPY(td->center, td->loc);
-	VECCOPY(td->iloc, td->loc);
-
-	// Setting normals
-	VECCOPY(td->axismtx[2], eve->no);
-	td->axismtx[0][0]		=
-		td->axismtx[0][1]	=
-		td->axismtx[0][2]	=
-		td->axismtx[1][0]	=
-		td->axismtx[1][1]	=
-		td->axismtx[1][2]	= 0.0f;
-
-	td->ext = NULL;
-	td->tdi = NULL;
-	td->val = NULL;
-}
-
-static void createTransEditVerts(TransInfo *t)
-{
-	TransData *tob = NULL;
-	EditMesh *em = G.editMesh;
-	EditVert *eve;
-	EditVert **nears = NULL;
-	float *vectors = NULL;
-	float mtx[3][3], smtx[3][3];
-	int count=0, countsel=0;
-	int propmode = t->flag & T_PROP_EDIT;
-		
-	// transform now requires awareness for select mode, so we tag the f1 flags in verts
-	if(G.scene->selectmode & SCE_SELECT_VERTEX) {
-		for(eve= em->verts.first; eve; eve= eve->next) {
-			if(eve->h==0 && (eve->f & SELECT)) 
-				eve->f1= SELECT;
-			else
-				eve->f1= 0;
-		}
-	}
-	else if(G.scene->selectmode & SCE_SELECT_EDGE) {
-		EditEdge *eed;
-		for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0;
-		for(eed= em->edges.first; eed; eed= eed->next) {
-			if(eed->h==0 && (eed->f & SELECT))
-				eed->v1->f1= eed->v2->f1= SELECT;
-		}
-	}
-	else {
-		EditFace *efa;
-		for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0;
-		for(efa= em->faces.first; efa; efa= efa->next) {
-			if(efa->h==0 && (efa->f & SELECT)) {
-				efa->v1->f1= efa->v2->f1= efa->v3->f1= SELECT;
-				if(efa->v4) efa->v4->f1= SELECT;
-			}
-		}
-	}
-	
-	/* now we can count */
-	for(eve= em->verts.first; eve; eve= eve->next) {
-		if(eve->h==0) {
-			if(eve->f1) countsel++;
-			if(propmode) count++;
-		}
-	}
-	
- 	/* note: in prop mode we need at least 1 selected */
-	if (countsel==0) return;
-	
-	if(propmode) {
-		t->total = count; 
-	
-		/* allocating scratch arrays */
-		vectors = (float *)malloc(t->total * 3 * sizeof(float));
-		nears = (EditVert**)malloc(t->total * sizeof(EditVert*));
-	}
-	else t->total = countsel;
-	tob= t->data= MEM_mallocN(t->total*sizeof(TransData), "TransObData(Mesh EditMode)");
-	
-	Mat3CpyMat4(mtx, G.obedit->obmat);
-	Mat3Inv(smtx, mtx);
-
-	if(propmode) editmesh_set_connectivity_distance(t->total, vectors, nears);
-	
-	for (eve=em->verts.first; eve; eve=eve->next) {
-		if(eve->h==0) {
-			if(propmode || eve->f1) {
-				VertsToTransData(tob, eve);
-
-				if(eve->f1) tob->flag |= TD_SELECTED;
-				if(propmode) {
-					if (eve->f2) {
-						float vec[3];
-						VECCOPY(vec, E_VEC(eve));
-						Mat3MulVecfl(mtx, vec);
-						tob->dist= VecLength(vec);
-					}
-					else {
-						tob->flag |= TD_NOTCONNECTED;
-						tob->dist = MAXFLOAT;
-					}
-				}
-				
-				Mat3CpyMat3(tob->smtx, smtx);
-				Mat3CpyMat3(tob->mtx, mtx);
-
-				tob++;
-			}
-		}	
-	}
-	if (propmode) {
-		free(vectors);
-		free(nears);
-	}
-
-}
-
-/* **************** IpoKey stuff, for Object TransData ********** */
-
-/* storage of bezier triple. thats why -3 and +3! */
-static void set_tdi_old(float *old, float *poin)
-{
-	old[0]= *(poin);
-	old[3]= *(poin-3);
-	old[6]= *(poin+3);
-}
-
-/* while transforming */
-static void add_tdi_poin(float *poin, float *old, float delta)
-{
-	if(poin) {
-		poin[0]= old[0]+delta;
-		poin[-3]= old[3]+delta;
-		poin[3]= old[6]+delta;
-	}
-}
-
-/* fill ipokey transdata with old vals and pointers */
-static void ipokey_to_transdata(IpoKey *ik, TransData *td)
-{
-	extern int ob_ar[];		// blenkernel ipo.c
-	TransDataIpokey *tdi= td->tdi;
-	BezTriple *bezt;
-	int a, delta= 0;
-	
-	for(a=0; a<OB_TOTIPO; a++) {
-		if(ik->data[a]) {
-			bezt= ik->data[a];
-			
-			switch( ob_ar[a] ) {
-				case OB_LOC_X:
-				case OB_DLOC_X:
-					tdi->locx= &(bezt->vec[1][1]); break;
-				case OB_LOC_Y:
-				case OB_DLOC_Y:
-					tdi->locy= &(bezt->vec[1][1]); break;
-				case OB_LOC_Z:
-				case OB_DLOC_Z:
-					tdi->locz= &(bezt->vec[1][1]); break;
-					
-				case OB_DROT_X:
-					delta= 1;
-				case OB_ROT_X:
-					tdi->rotx= &(bezt->vec[1][1]); break;
-				case OB_DROT_Y:
-					delta= 1;
-				case OB_ROT_Y:
-					tdi->roty= &(bezt->vec[1][1]); break;
-				case OB_DROT_Z:
-					delta= 1;
-				case OB_ROT_Z:
-					tdi->rotz= &(bezt->vec[1][1]); break;
-					
-				case OB_SIZE_X:
-				case OB_DSIZE_X:
-					tdi->sizex= &(bezt->vec[1][1]); break;
-				case OB_SIZE_Y:
-				case OB_DSIZE_Y:
-					tdi->sizey= &(bezt->vec[1][1]); break;
-				case OB_SIZE_Z:
-				case OB_DSIZE_Z:
-					tdi->sizez= &(bezt->vec[1][1]); break;		
-			}	
-		}
-	}
-	
-	/* oldvals for e.g. undo */
-	if(tdi->locx) set_tdi_old(tdi->oldloc, tdi->locx);
-	if(tdi->locy) set_tdi_old(tdi->oldloc+1, tdi->locy);
-	if(tdi->locz) set_tdi_old(tdi->oldloc+2, tdi->locz);
-	
-	/* remember, for mapping curves ('1'=10 degrees)  */
-	if(tdi->rotx) set_tdi_old(tdi->oldrot, tdi->rotx);
-	if(tdi->roty) set_tdi_old(tdi->oldrot+1, tdi->roty);
-	if(tdi->rotz) set_tdi_old(tdi->oldrot+2, tdi->rotz);
-	
-	/* this is not allowed to be dsize! */
-	if(tdi->sizex) set_tdi_old(tdi->oldsize, tdi->sizex);
-	if(tdi->sizey) set_tdi_old(tdi->oldsize+1, tdi->sizey);
-	if(tdi->sizez) set_tdi_old(tdi->oldsize+2, tdi->sizez);
-	
-	tdi->flag= TOB_IPO;
-	if(delta) tdi->flag |= TOB_IPODROT;
-}
-
-
-/* *************************** Object Transform data ******************* */
-
-static void ObjectToTransData(TransData *td, Object *ob) 
-{
-	float obmtx[3][3];
-	Object *tr;
-	void *cfirst, *clast;
-
-	cfirst = ob->constraints.first;
-	clast = ob->constraints.last;
-	ob->constraints.first=ob->constraints.last=NULL;
-
-	tr= ob->track;
-	ob->track= NULL;
-
-	where_is_object(ob);
-
-	ob->track= tr;
-
-	ob->constraints.first = cfirst;
-	ob->constraints.last = clast;
-
-	td->ob = ob;
-
-	td->loc = ob->loc;
-	VECCOPY(td->iloc, td->loc);
-	
-	td->ext->rot = ob->rot;
-	VECCOPY(td->ext->irot, ob->rot);
-	VECCOPY(td->ext->drot, ob->drot);
-	
-	td->ext->size = ob->size;
-	VECCOPY(td->ext->isize, ob->size);
-	VECCOPY(td->ext->dsize, ob->dsize);
-
-	VECCOPY(td->center, ob->obmat[3]);
-
-	Mat3CpyMat4(td->axismtx, ob->obmat);
-	Mat3Ortho(td->axismtx);
-
-	if (ob->parent)
-	{
-		float totmat[3][3], obinv[3][3];
-		
-		/* we calculate smtx without obmat: so a parmat */
-		object_to_mat3(ob, obmtx);
-		Mat3CpyMat4(totmat, ob->obmat);
-		Mat3Inv(obinv, totmat);
-		Mat3MulMat3(td->smtx, obmtx, obinv);
-		Mat3Inv(td->mtx, td->smtx);
-	}
-	else
-	{
-		Mat3One(td->smtx);
-		Mat3One(td->mtx);
-	}
-}
-
-/* only used in function below, stuff to be removed */
-static Object *is_a_parent_selected_int(Object *startob, Object *ob, GHash *done_hash) 
-{
-	if (ob!=startob && TESTBASE(ob))
-		return ob;
-	
-	if (BLI_ghash_haskey(done_hash, ob))
-		return NULL;
-	else
-		BLI_ghash_insert(done_hash, ob, NULL);
-	
-	if (ob->parent) {
-		Object *par= is_a_parent_selected_int(startob, ob->parent, done_hash);
-		if (par)
-			return par;
-	}
-	return NULL;
-}
-
-/* only used in function below, stuff to be removed */
-static Object *is_a_parent_selected(Object *ob) 
-{
-	GHash *gh= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
-	Object *res= is_a_parent_selected_int(ob, ob, gh);
-	BLI_ghash_free(gh, NULL, NULL);
-	
-	return res;
-}
-
-
-
-/* sets flags in Bases to define whether they take part in transform */
-/* it deselects Bases, so we have to call the clear function always after */
-static void set_trans_object_base_flags(TransInfo *t)
-{
-	/*
-	 if Base selected and has parent selected:
-	 base->flag= BA_WASSEL+BA_PARSEL
-	 if base not selected and parent selected:
-	 base->flag= BA_PARSEL
-	 */
-	GHash *object_to_base_hash= NULL; 
-	Base *base;
-	
-	/* moved to start of function, it is needed for hooks now too */
-	if (!object_to_base_hash) {
-		Base *b;
-		object_to_base_hash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
-		
-		for (b= FIRSTBASE; b; b= b->next)
-			BLI_ghash_insert(object_to_base_hash, b->object, b);
-	}
-	
-	/* makes sure base flags and object flags are identical */
-	copy_baseflags();
-	
-	for (base= FIRSTBASE; base; base= base->next) {
-		base->flag &= ~(BA_PARSEL+BA_WASSEL);
-		
-		if( (base->lay & G.vd->lay) && base->object->id.lib==0) {
-			Object *ob= base->object;
-			Object *parsel= is_a_parent_selected(ob);
-			
-			/* parentkey here? */
-			
-			if(parsel) {
-				if(base->flag & SELECT) {
-					base->flag &= ~SELECT;
-					base->flag |= (BA_PARSEL+BA_WASSEL);
-				}
-				else base->flag |= BA_PARSEL;
-			}
-			
-			if(t->mode==TFM_TRANSLATION)  {
-				if(ob->track && TESTBASE(ob->track) && (base->flag & SELECT)==0)  
-					base->flag |= BA_PARSEL;
-			}
-			
-			/* updates? */
-			if(ob->hooks.first) {
-				Base *b;
-				ObHook *hook= ob->hooks.first;
-				
-				while(hook) {
-					if(hook->parent) {
-						Object *parsel= is_a_parent_selected(hook->parent);
-						
-						b= BLI_ghash_lookup(object_to_base_hash, hook->parent);
-						if(parsel || ((base->flag | b->flag) & (SELECT | BA_PARSEL)) ) {
-							base->flag |= BA_DISP_UPDATE;
-						}
-					}
-					hook= hook->next;
-				}
-			}
-			
-			if(ob->parent && ob->parent->type==OB_LATTICE)
-				if(ob->parent->hooks.first) base->flag |= BA_DISP_UPDATE;
-			
-			if(base->flag & (SELECT | BA_PARSEL)) {
-				
-				base->flag |= BA_WHERE_UPDATE;
-				
-				if(ob->parent) {
-					if(ob->parent->type==OB_LATTICE) base->flag |= BA_DISP_UPDATE;
-					else if(ob->partype==PARSKEL) {
-						if ELEM3(ob->parent->type, OB_IKA, OB_CURVE, OB_ARMATURE) 
-							base->flag |= BA_DISP_UPDATE;
-					}
-				}
-				if(ob->track) {
-					;
-				}
-				
-				if( give_parteff(ob) ) base->flag |= BA_DISP_UPDATE;
-				
-				if(ob->type==OB_MBALL) {
-					Base *b;
-					
-					b= BLI_ghash_lookup(object_to_base_hash, find_basis_mball(ob));
-					b->flag |= BA_DISP_UPDATE;
-				}
-			}
-		}
-	}
-	
-	if (object_to_base_hash)
-		BLI_ghash_free(object_to_base_hash, NULL, NULL);
-	
-}
-
-static void clear_trans_object_base_flags(void)
-{
-	Base *base;
-	
-	base= FIRSTBASE;
-	while(base) {
-		if(base->flag & BA_WASSEL) base->flag |= SELECT;
-		base->flag &= ~(BA_PARSEL+BA_WASSEL);
-		
-		base->flag &= ~(BA_DISP_UPDATE+BA_WHERE_UPDATE+BA_DO_IPO);
-		
-		/* pose here? */
-		if (base->object->pose) {
-			Object *ob= base->object;
-			bPoseChannel *chan;
-			for (chan = ob->pose->chanbase.first; chan; chan=chan->next) {
-				chan->flag &= ~PCHAN_TRANS_UPDATE;
-			}
-		}
-		
-		base= base->next;
-	}
-	copy_baseflags();
-}
-
-
-static void createTransObject(TransInfo *t)
-{
-	TransData *td = NULL;
-	TransDataExtension *tx;
-	Object *ob;
-	Base *base;
-	IpoKey *ik;
-	ListBase elems;
-	
-	/* hackish... but we have to do it somewhere */
-	reset_slowparents();
-	
-	set_trans_object_base_flags(t);
-
-	/* this has to be done, or else constraints on armature
-	 * bones that point to objects/bones that are outside
-	 * of the armature don't work outside of posemode 
-	 * (and yes, I know it's confusing ...).
-	 */
-	figure_pose_updating();
-
-	/* count */	
-	for(base= FIRSTBASE; base; base= base->next) {
-		if TESTBASELIB(base) {
-			ob= base->object;
-			
-			/* store ipo keys? */
-			if(ob->ipo && ob->ipo->showkey && (ob->ipoflag & OB_DRAWKEY)) {
-				elems.first= elems.last= NULL;
-				make_ipokey_transform(ob, &elems, 1); /* '1' only selected keys */
-				
-				pushdata(&elems, sizeof(ListBase));
-				
-				for(ik= elems.first; ik; ik= ik->next) Trans.total++;
-
-				if(elems.first==NULL) Trans.total++;
-			}
-			else {
-				Trans.total++;
-			}
-		}
-	}
-
-	if(!t->total) {
-		/* clear here, main transform function escapes too */
-		clear_trans_object_base_flags();
-		return;
-	}
-	
-	td = t->data = MEM_mallocN(Trans.total*sizeof(TransData), "TransOb");
-	tx = t->ext = MEM_mallocN(Trans.total*sizeof(TransDataExtension), "TransObExtension");
-
-	for(base= FIRSTBASE; base; base= base->next) {
-		if TESTBASELIB(base) {
-			ob= base->object;
-			
-			td->flag= TD_SELECTED;
-			td->ext = tx;
-
-			/* store ipo keys? */
-			if(ob->ipo && ob->ipo->showkey && (ob->ipoflag & OB_DRAWKEY)) {
-				
-				popfirst(&elems);	// bring back pushed listbase
-				
-				if(elems.first) {
-					float cfraont;
-					int ipoflag;
-					
-					base->flag |= BA_DO_IPO+BA_WASSEL;
-					base->flag &= ~SELECT;
-					
-					cfraont= CFRA;
-					set_no_parent_ipo(1);
-					ipoflag= ob->ipoflag;
-					ob->ipoflag &= ~OB_OFFS_OB;
-					
-					pushdata(ob->loc, 7*3*4); // tsk! tsk!
-					
-					for(ik= elems.first; ik; ik= ik->next) {
-						
-						/* weak... this doesn't correct for floating values, giving small errors */
-						CFRA= (short)(ik->val/G.scene->r.framelen);
-						
-						do_ob_ipo(ob);
-						ObjectToTransData(td, ob);	// does where_is_object()
-						
-						td->tdi= MEM_callocN(sizeof(TransDataIpokey), "TransDataIpokey");
-						/* also does tdi->flag and oldvals, needs to be after ob_to_transob()! */
-						ipokey_to_transdata(ik, td);
-						
-						td++;
-						tx++;
-						if(ik->next) td->ext= tx;	// prevent corrupting mem!
-					}
-					free_ipokey(&elems);
-					
-					poplast(ob->loc);
-					set_no_parent_ipo(0);
-					
-					CFRA= (short)cfraont;
-					ob->ipoflag= ipoflag;
-				}
-				else {
-					ObjectToTransData(td, ob);
-					td->tdi = NULL;
-					td->val = NULL;
-				}
-			}
-			else {
-				ObjectToTransData(td, ob);
-				td->tdi = NULL;
-				td->val = NULL;
-			}
-			td++;
-			tx++;
-		}
-	}
-}
-
-static void createTransData(TransInfo *t) 
-{
-	if (t->context == CTX_TEXTURE) {
-		t->flag |= T_TEXTURE;
-		createTransTexspace(t);
-	}
-	else if (t->context == CTX_EDGE) {
-		t->ext = NULL;
-		t->flag |= T_EDIT;
-		createTransEdge(t);
-		if(t->data && t->flag & T_PROP_EDIT) {
-			sort_trans_data(t);	// makes selected become first in array
-			set_prop_dist(t, 1);
-			sort_trans_data_dist(t);
-		}
-	}
-	else if (G.obpose) {
-		t->flag |= T_POSE;
-		createTransPose(t);
-	}
-	else if (G.obedit) {
-		t->ext = NULL;
-		if (G.obedit->type == OB_MESH) {
-			if(t->mode==TFM_SHRINKFATTEN && (t->context & CTX_NO_NOR_RECALC)==0)
-				vertexnormals(0);
-			createTransEditVerts(t);	
-   		}
-		else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) {
-			createTransCurveVerts(t);
-		}
-		else if (G.obedit->type==OB_LATTICE) {
-			createTransLatticeVerts(t);
-		}
-		else if (G.obedit->type==OB_MBALL) {
-			createTransMBallVerts(t);
-		}
-		else if (G.obedit->type==OB_ARMATURE) {
-			createTransArmatureVerts(t);
-  		}					  		
-		else {
-			printf("not done yet! only have mesh surface curve\n");
-		}
-
-		if(t->data && t->flag & T_PROP_EDIT) {
-			if (ELEM(G.obedit->type, OB_CURVE, OB_MESH)) {
-				sort_trans_data(t);	// makes selected become first in array
-				set_prop_dist(t, 0);
-				sort_trans_data_dist(t);
-			}
-			else {
-				sort_trans_data(t);	// makes selected become first in array
-				set_prop_dist(t, 1);
-				sort_trans_data_dist(t);
-			}
-		}
-		t->flag |= T_EDIT;
-	}
-	else {
-		createTransObject(t);
-		t->flag |= T_OBJECT;
-	}
-
-	if((t->flag & T_OBJECT) && G.vd->camera==OBACT && G.vd->persp>1) {
-		t->flag |= T_CAMERA;
-	}
-}
-
 #define TRANS_CANCEL	2
 #define TRANS_CONFIRM	1
 
diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c
index 532c9b53891..102b3a6c19a 100755
--- a/source/blender/src/transform_constraints.c
+++ b/source/blender/src/transform_constraints.c
@@ -102,8 +102,6 @@
 #include "mydevice.h"
 
 #include "transform.h"
-#include "transform_constraints.h"
-#include "transform_generics.h"
 
 extern ListBase editNurb;
 extern ListBase editelems;
diff --git a/source/blender/src/transform_constraints.h b/source/blender/src/transform_constraints.h
deleted file mode 100755
index 09e49f2678b..00000000000
--- a/source/blender/src/transform_constraints.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef TRANSFORM_CONSTRAINTS_H
-#define TRANSFORM_CONSTRAINTS_H
-
-#include "transform.h"
-
-void getConstraintMatrix(TransInfo *t);
-void setConstraint(TransInfo *t, float space[3][3], int mode, const char text[]);
-void setLocalConstraint(TransInfo *t, int mode, const char text[]);
-
-void constraintNumInput(TransInfo *t, float vec[3]);
-
-//void drawConstraint(TransCon *t);
-void drawConstraint();
-
-//void drawPropCircle(TransInfo *t);
-void drawPropCircle();
-
-void initConstraint(TransInfo *t);
-void startConstraint(TransInfo *t);
-void stopConstraint(TransInfo *t);
-
-void getConstraintMatrix(TransInfo *t);
-
-void initSelectConstraint(TransInfo *t);
-void selectConstraint(TransInfo *t);
-void postSelectConstraint(TransInfo *t);
-
-int getConstraintSpaceDimension(TransInfo *t);
-
-void setNearestAxis(TransInfo *t);
-
-#endif
-
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c
new file mode 100755
index 00000000000..f9b6ae7d060
--- /dev/null
+++ b/source/blender/src/transform_conversions.c
@@ -0,0 +1,1572 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+#endif
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_action_types.h"
+#include "DNA_armature_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_effect_types.h"
+#include "DNA_ika_types.h"
+#include "DNA_image_types.h"
+#include "DNA_ipo_types.h"
+#include "DNA_key_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_meta_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_texture_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_world_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_property_types.h"
+#include "DNA_vfont_types.h"
+#include "DNA_constraint_types.h"
+
+#include "BIF_editview.h"
+#include "BIF_resources.h"
+#include "BIF_mywindow.h"
+#include "BIF_gl.h"
+#include "BIF_editlattice.h"
+#include "BIF_editarmature.h"
+#include "BIF_editmesh.h"
+#include "BIF_screen.h"
+#include "BIF_space.h"
+#include "BIF_toolbox.h"
+
+#include "BKE_action.h"
+#include "BKE_armature.h"
+#include "BKE_blender.h"
+#include "BKE_curve.h"
+#include "BKE_displist.h"
+#include "BKE_effect.h"
+#include "BKE_global.h"
+#include "BKE_ipo.h"
+#include "BKE_lattice.h"
+#include "BKE_mball.h"
+#include "BKE_object.h"
+#include "BKE_utildefines.h"
+
+#include "BSE_view.h"
+#include "BSE_edit.h"
+#include "BSE_editipo.h"
+#include "BSE_editipo_types.h"
+#include "BDR_editobject.h"		// reset_slowparents()
+
+#include "BLI_arithb.h"
+#include "BLI_editVert.h"
+#include "BLI_ghash.h"
+
+#include "PIL_time.h"
+
+#include "blendef.h"
+
+#include "mydevice.h"
+
+extern ListBase editNurb;
+extern ListBase editelems;
+
+#include "transform.h"
+
+/* ************************** Functions *************************** */
+
+static void qsort_trans_data(TransInfo *t, TransData *head, TransData *tail) {
+	TransData pivot = *head;
+	TransData *ihead = head;
+	TransData *itail = tail;
+	short connected = t->flag & T_PROP_CONNECTED;
+
+	while (head < tail)
+	{
+		if (connected) {
+			while ((tail->dist >= pivot.dist) && (head < tail))
+				tail--;
+		}
+		else {
+			while ((tail->rdist >= pivot.rdist) && (head < tail))
+				tail--;
+		}
+
+		if (head != tail)
+		{
+			*head = *tail;
+			head++;
+		}
+
+		if (connected) {
+			while ((head->dist <= pivot.dist) && (head < tail))
+				head++;
+		}
+		else {
+			while ((head->rdist <= pivot.rdist) && (head < tail))
+				head++;
+		}
+
+		if (head != tail)
+		{
+			*tail = *head;
+			tail--;
+		}
+	}
+
+	*head = pivot;
+	if (ihead < head) {
+		qsort_trans_data(t, ihead, head-1);
+	}
+	if (itail > head) {
+		qsort_trans_data(t, head+1, itail);
+	}
+}
+
+void sort_trans_data_dist(TransInfo *t) {
+	TransData *start = t->data;
+	int i = 1;
+
+	while(i < t->total && start->flag & TD_SELECTED) {
+		start++;
+		i++;
+	}
+	qsort_trans_data(t, start, t->data + t->total - 1);
+}
+
+static void sort_trans_data(TransInfo *t) 
+{
+	TransData *sel, *unsel;
+	TransData temp;
+	unsel = t->data;
+	sel = t->data;
+	sel += t->total - 1;
+	while (sel > unsel) {
+		while (unsel->flag & TD_SELECTED) {
+			unsel++;
+			if (unsel == sel) {
+				return;
+			}
+		}
+		while (!(sel->flag & TD_SELECTED)) {
+			sel--;
+			if (unsel == sel) {
+				return;
+			}
+		}
+		temp = *unsel;
+		*unsel = *sel;
+		*sel = temp;
+		sel--;
+		unsel++;
+	}
+}
+
+
+/* distance calculated from not-selected vertex to nearest selected vertex
+   warning; this is loops inside loop, has minor N^2 issues, but by sorting list it is OK */
+static void set_prop_dist(TransInfo *t, short with_dist)
+{
+	TransData *tob;
+	int a;
+	
+	for(a=0, tob= t->data; a<t->total; a++, tob++) {
+		
+		tob->rdist= 0.0f; // init, it was mallocced
+		
+		if((tob->flag & TD_SELECTED)==0) {
+			TransData *td;
+			int i;
+			float dist, vec[3];
+
+			tob->rdist = -1.0f; // signal for next loop
+				
+			for (i = 0, td= t->data; i < t->total; i++, td++) {
+				if(td->flag & TD_SELECTED) {
+					VecSubf(vec, tob->center, td->center);
+					Mat3MulVecfl(tob->mtx, vec);
+					dist = Normalise(vec);
+					if (tob->rdist == -1.0f) {
+						tob->rdist = dist;
+					}
+					else if (dist < tob->rdist) {
+						tob->rdist = dist;
+					}
+				}
+				else break;	// by definition transdata has selected items in beginning
+			}
+			if (with_dist) {
+				tob->dist = tob->rdist;
+			}
+		}	
+	}
+}
+
+/* ************************** CONVERSIONS ************************* */
+
+/* ********************* texture space ********* */
+
+static void createTransTexspace(TransInfo *t)
+{
+	TransData *td;
+	Object *ob;
+	ID *id;
+	
+	ob= OBACT;
+	t->total = 1;
+	td= t->data= MEM_callocN(sizeof(TransData), "TransTexspace");
+	td->ext= t->ext= MEM_callocN(sizeof(TransDataExtension), "TransTexspace");
+	
+	td->flag= TD_SELECTED;
+	VECCOPY(td->center, ob->obmat[3]);
+	td->ob = ob;
+	
+	Mat3CpyMat4(td->mtx, ob->obmat);
+	Mat3Inv(td->smtx, td->mtx);
+	
+	id= ob->data;
+	if(id==0);
+	else if( GS(id->name)==ID_ME) {
+		Mesh *me= ob->data;
+		me->texflag &= ~AUTOSPACE;
+		td->loc= me->loc;
+		td->ext->rot= me->rot;
+		td->ext->size= me->size;
+	}
+	else if( GS(id->name)==ID_CU) {
+		Curve *cu= ob->data;
+		cu->texflag &= ~CU_AUTOSPACE;
+		td->loc= cu->loc;
+		td->ext->rot= cu->rot;
+		td->ext->size= cu->size;
+	}
+	else if( GS(id->name)==ID_MB) {
+		MetaBall *mb= ob->data;
+		mb->texflag &= ~MB_AUTOSPACE;
+		td->loc= mb->loc;
+		td->ext->rot= mb->rot;
+		td->ext->size= mb->size;
+	}
+	
+	VECCOPY(td->iloc, td->loc);
+	VECCOPY(td->ext->irot, td->ext->rot);
+	VECCOPY(td->ext->isize, td->ext->size);
+}
+
+/* ********************* edge (for crease) ***** */
+
+static void createTransEdge(TransInfo *t) {
+	TransData *td = NULL;
+	EditMesh *em = G.editMesh;
+	EditEdge *eed;
+	Mesh *me = G.obedit->data;
+	EditVert **nears = NULL;
+	float *vectors = NULL;
+	float mtx[3][3], smtx[3][3];
+	int count=0, countsel=0;
+	int propmode = t->flag & T_PROP_EDIT;
+
+	/* THIS IS A REALLY STUPID HACK, MUST BE A BETTER WAY TO DO IT */
+	/* this is sufficient to invoke edges added in mesh, but only in editmode */
+	if(me->medge==NULL) {
+		me->medge= MEM_callocN(sizeof(MEdge), "fake medge");
+		me->totedge= 1;
+		allqueue(REDRAWBUTSEDIT, 0);
+	}
+					
+	for(eed= em->edges.first; eed; eed= eed->next) {
+		if(eed->h==0) {
+			if (eed->f & SELECT) countsel++;
+			if (propmode) count++;
+		}
+	}
+
+	if (countsel == 0)
+		return;
+
+	if(propmode) {
+		t->total = count;
+	}
+	else {
+		t->total = countsel;
+	}
+
+	td= t->data= MEM_callocN(t->total * sizeof(TransData), "TransCrease");
+
+	Mat3CpyMat4(mtx, G.obedit->obmat);
+	Mat3Inv(smtx, mtx);
+
+	for(eed= em->edges.first; eed; eed= eed->next) {
+		if(eed->h==0 && (eed->f & SELECT || propmode)) {
+			/* need to set center for center calculations */
+			VecAddf(td->center, eed->v1->co, eed->v2->co);
+			VecMulf(td->center, 0.5f);
+
+			td->loc= NULL;
+			if (eed->f & SELECT)
+				td->flag= TD_SELECTED;
+			else 
+				td->flag= 0;
+
+
+			Mat3CpyMat3(td->smtx, smtx);
+			Mat3CpyMat3(td->mtx, mtx);
+
+			td->ext = NULL;
+			td->tdi = NULL;
+			td->val = &(eed->crease);
+			td->ival = eed->crease;
+
+			td++;
+		}
+	}
+}
+
+/* ********************* pose mode ************* */
+
+/* callback, make sure it's identical structured as next one */
+/* also used to count for manipulator */
+void count_bone_select(TransInfo *t, ListBase *lb, int *counter) 
+{
+	Bone *bone;
+	int deeper= 1;
+	
+	for(bone= lb->first; bone; bone= bone->next) {
+		if (bone->flag & BONE_SELECTED) {
+			/* We don't let IK children get "grabbed" */
+			/* ALERT! abusive global Trans here */
+			if ( (t->mode!=TFM_TRANSLATION) || (bone->flag & BONE_IK_TOPARENT)==0 ) {
+				(*counter)++;
+				deeper= 0;	// no transform on children if one parent bone is selected
+			}
+			else deeper= 1;
+		}
+		if(deeper) count_bone_select(t, &bone->childbase, counter);
+	}
+}
+
+/* recursive */
+static void add_pose_transdata(TransInfo *t, ListBase *lb, Object *ob, TransData **tdp)
+{
+	Bone *bone;
+	TransData *td= *tdp;
+	float	parmat[4][4], tempmat[4][4];
+	float tempobmat[4][4];
+	float vec[3];
+	int deeper= 1;
+	
+	for(bone= lb->first; bone; bone= bone->next) {
+		if (bone->flag & BONE_SELECTED) {
+			/* We don't let IK children get "grabbed" */
+			/* ALERT! abusive global Trans here */
+			if ( (t->mode!=TFM_TRANSLATION) || (bone->flag & BONE_IK_TOPARENT)==0 ) {
+				
+				get_bone_root_pos (bone, vec, 1);
+				
+				//VecAddf (centroid, centroid, vec);
+				VECCOPY(td->center, vec);
+				
+				td->ob = ob;
+				td->flag= TD_SELECTED|TD_USEQUAT;
+				td->loc = bone->loc;
+				VECCOPY(td->iloc, bone->loc);
+				
+				td->ext->rot= NULL;
+				td->ext->quat= bone->quat;
+				td->ext->size= bone->size;
+				td->ext->bone= bone; //	FIXME: Dangerous
+
+				QUATCOPY(td->ext->iquat, bone->quat);
+				VECCOPY(td->ext->isize, bone->size);
+				
+				/* Get the matrix of this bone minus the usertransform */
+				Mat4CpyMat4 (tempobmat, bone->obmat);
+				Mat4One (bone->obmat);
+				get_objectspace_bone_matrix(bone, tempmat, 1, 1);
+				Mat4CpyMat4 (bone->obmat, tempobmat);
+
+				Mat4MulMat4 (parmat, tempmat, ob->obmat);	/* Original */
+				
+				Mat3CpyMat4 (td->mtx, parmat);
+				Mat3Inv (td->smtx, td->mtx);
+				
+				(*tdp)++;
+				td= *tdp;
+				deeper= 0;
+			}
+			else deeper= 1;
+		}
+		if(deeper) add_pose_transdata(t, &bone->childbase, ob, tdp);
+	}
+}
+
+static void createTransPose(TransInfo *t)
+{
+	bArmature *arm;
+	TransData *td;
+	TransDataExtension *tdx;
+	int i;
+	
+	/* check validity of state */
+	arm=get_armature (G.obpose);
+	if (arm==NULL) return;
+	
+	if (arm->flag & ARM_RESTPOS){
+		notice ("Transformation not possible while Rest Position is enabled");
+		return;
+	}
+	if (!(G.obpose->lay & G.vd->lay)) return;
+
+	/* copied from old code, no idea. we let linker solve it for now */
+	{
+		extern void figure_bone_nocalc(Object *ob);
+		extern void figure_pose_updating(void);
+
+		/* figure out which bones need calculating */
+		figure_bone_nocalc(G.obpose);
+		figure_pose_updating();
+	}
+	
+	/* copied from old code, no idea... (ton) */
+	apply_pose_armature(arm, G.obpose->pose, 0);
+	where_is_armature (G.obpose);
+	
+	/* count total */
+	count_bone_select(t, &arm->bonebase, &t->total);
+	
+	if(t->total==0 && t->mode==TFM_TRANSLATION) {
+		t->mode= TFM_ROTATION;
+		count_bone_select(t, &arm->bonebase, &t->total);
+	}		
+	if(t->total==0) return;
+	
+	/* init trans data */
+    td = t->data = MEM_mallocN(t->total*sizeof(TransData), "TransPoseBone");
+    tdx = t->ext = MEM_mallocN(t->total*sizeof(TransDataExtension), "TransPoseBoneExt");
+	for(i=0; i<t->total; i++, td++, tdx++) {
+		td->ext= tdx;
+		td->tdi = NULL;
+		td->val = NULL;
+	}	
+	/* recursive fill trans data */
+	td= t->data;
+	add_pose_transdata(t, &arm->bonebase, G.obpose, &td);
+	
+}
+
+/* ********************* armature ************** */
+
+static void createTransArmatureVerts(TransInfo *t)
+{
+	EditBone *ebo;
+	TransData *td;
+	float mtx[3][3], smtx[3][3];
+
+	t->total = 0;
+	for (ebo=G.edbo.first;ebo;ebo=ebo->next){
+		if (ebo->flag & BONE_TIPSEL){
+			t->total++;
+		}
+		if (ebo->flag & BONE_ROOTSEL){
+			t->total++;
+		}
+	}
+
+    if (!t->total) return;
+	
+	Mat3CpyMat4(mtx, G.obedit->obmat);
+	Mat3Inv(smtx, mtx);
+
+    td = t->data = MEM_mallocN(t->total*sizeof(TransData), "TransEditBone");
+	
+	for (ebo=G.edbo.first;ebo;ebo=ebo->next){
+		if (ebo->flag & BONE_TIPSEL){
+			VECCOPY (td->iloc, ebo->tail);
+			VECCOPY (td->center, td->iloc);
+			td->loc= ebo->tail;
+			td->flag= TD_SELECTED;
+
+			Mat3CpyMat3(td->smtx, smtx);
+			Mat3CpyMat3(td->mtx, mtx);
+
+			td->ext = NULL;
+			td->tdi = NULL;
+			td->val = NULL;
+
+			td++;
+		}
+		if (ebo->flag & BONE_ROOTSEL){
+			VECCOPY (td->iloc, ebo->head);
+			VECCOPY (td->center, td->iloc);
+			td->loc= ebo->head;
+			td->flag= TD_SELECTED;
+
+			Mat3CpyMat3(td->smtx, smtx);
+			Mat3CpyMat3(td->mtx, mtx);
+
+			td->ext = NULL;
+			td->tdi = NULL;
+			td->val = NULL;
+
+			td++;
+		}
+			
+	}
+}
+
+/* ********************* meta elements ********* */
+
+static void createTransMBallVerts(TransInfo *t)
+{
+ 	MetaElem *ml;
+	TransData *td;
+	TransDataExtension *tx;
+	float mtx[3][3], smtx[3][3];
+	int count=0, countsel=0;
+	int propmode = t->flag & T_PROP_EDIT;
+
+	/* count totals */
+	for(ml= editelems.first; ml; ml= ml->next) {
+		if(ml->flag & SELECT) countsel++;
+		if(propmode) count++;
+	}
+
+	/* note: in prop mode we need at least 1 selected */
+	if (countsel==0) return;
+	
+	if(propmode) t->total = count; 
+	else t->total = countsel;
+	
+	td = t->data= MEM_mallocN(t->total*sizeof(TransData), "TransObData(MBall EditMode)");
+	tx = t->ext = MEM_mallocN(t->total*sizeof(TransDataExtension), "MetaElement_TransExtension");
+
+	Mat3CpyMat4(mtx, G.obedit->obmat);
+	Mat3Inv(smtx, mtx);
+    
+	for(ml= editelems.first; ml; ml= ml->next) {
+		if(propmode || (ml->flag & SELECT)) {
+			td->loc= &ml->x;
+			VECCOPY(td->iloc, td->loc);
+			VECCOPY(td->center, td->loc);
+
+			if(ml->flag & SELECT) td->flag= TD_SELECTED | TD_USEQUAT;
+			else td->flag= TD_USEQUAT;
+
+			Mat3CpyMat3(td->smtx, smtx);
+			Mat3CpyMat3(td->mtx, mtx);
+
+			td->ext = tx;
+			td->tdi = NULL;
+			td->val = NULL;
+
+			tx->size = &ml->expx;
+			tx->isize[0] = ml->expx;
+			tx->isize[1] = ml->expy;
+			tx->isize[2] = ml->expz;
+
+			tx->quat = ml->quat;
+			QUATCOPY(tx->iquat, ml->quat);
+
+			tx->rot = NULL;
+
+			td++;
+			tx++;
+		}
+	}
+} 
+
+/* ********************* curve/surface ********* */
+
+static void calc_distanceCurveVerts(TransData *head, TransData *tail) {
+	TransData *td, *td_near = NULL;
+	for (td = head; td<=tail; td++) {
+		if (td->flag & TD_SELECTED) {
+			td_near = td;
+			td->dist = 0.0f;
+		}
+		else if(td_near) {
+			float dist;
+			dist = VecLenf(td_near->center, td->center);
+			if (dist < (td-1)->dist) {
+				td->dist = (td-1)->dist;
+			}
+			else {
+				td->dist = dist;
+			}
+		}
+		else {
+			td->dist = MAXFLOAT;
+			td->flag |= TD_NOTCONNECTED;
+		}
+	}
+	td_near = NULL;
+	for (td = tail; td>=head; td--) {
+		if (td->flag & TD_SELECTED) {
+			td_near = td;
+			td->dist = 0.0f;
+		}
+		else if(td_near) {
+			float dist;
+			dist = VecLenf(td_near->center, td->center);
+			if (td->flag & TD_NOTCONNECTED || dist < td->dist || (td+1)->dist < td->dist) {
+				td->flag &= ~TD_NOTCONNECTED;
+				if (dist < (td+1)->dist) {
+					td->dist = (td+1)->dist;
+				}
+				else {
+					td->dist = dist;
+				}
+			}
+		}
+	}
+}
+
+static void createTransCurveVerts(TransInfo *t)
+{
+	TransData *td = NULL;
+  	Nurb *nu;
+	BezTriple *bezt;
+	BPoint *bp;
+	float mtx[3][3], smtx[3][3];
+	int a;
+	int count=0, countsel=0;
+	int propmode = t->flag & T_PROP_EDIT;
+
+	/* count total of vertices, check identical as in 2nd loop for making transdata! */
+	for(nu= editNurb.first; nu; nu= nu->next) {
+		if((nu->type & 7)==CU_BEZIER) {
+			for(a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
+				if(bezt->hide==0) {
+					if(bezt->f1 & 1) countsel++;
+					if(bezt->f2 & 1) countsel++;
+					if(bezt->f3 & 1) countsel++;
+					if(propmode) count+= 3;
+				}
+			}
+		}
+		else {
+			for(a= nu->pntsu*nu->pntsv, bp= nu->bp; a>0; a--, bp++) {
+				if(bp->hide==0) {
+					if(propmode) count++;
+					if(bp->f1 & 1) countsel++;
+				}
+			}
+		}
+	}
+	/* note: in prop mode we need at least 1 selected */
+	if (countsel==0) return;
+	
+	if(propmode) t->total = count; 
+	else t->total = countsel;
+	t->data= MEM_mallocN(t->total*sizeof(TransData), "TransObData(Curve EditMode)");
+
+	Mat3CpyMat4(mtx, G.obedit->obmat);
+	Mat3Inv(smtx, mtx);
+
+    td = t->data;
+	for(nu= editNurb.first; nu; nu= nu->next) {
+		if((nu->type & 7)==CU_BEZIER) {
+			for(a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
+				if(bezt->hide==0) {
+					if(propmode || (bezt->f1 & 1)) {
+						VECCOPY(td->iloc, bezt->vec[0]);
+						td->loc= bezt->vec[0];
+						VECCOPY(td->center, bezt->vec[1]);
+						if(bezt->f1 & 1) td->flag= TD_SELECTED;
+						else td->flag= 0;
+						td->ext = NULL;
+						td->tdi = NULL;
+						td->val = NULL;
+
+						Mat3CpyMat3(td->smtx, smtx);
+						Mat3CpyMat3(td->mtx, mtx);
+
+						td++;
+						count++;
+					}
+					/* THIS IS THE CV, the other two are handles */
+					if(propmode || (bezt->f2 & 1)) {
+						VECCOPY(td->iloc, bezt->vec[1]);
+						td->loc= bezt->vec[1];
+						VECCOPY(td->center, td->loc);
+						if(bezt->f2 & 1) td->flag= TD_SELECTED;
+						else td->flag= 0;
+						td->ext = NULL;
+						td->tdi = NULL;
+						td->val = &(bezt->alfa);
+						td->ival = bezt->alfa;
+
+						Mat3CpyMat3(td->smtx, smtx);
+						Mat3CpyMat3(td->mtx, mtx);
+
+						td++;
+						count++;
+					}
+					if(propmode || (bezt->f3 & 1)) {
+						VECCOPY(td->iloc, bezt->vec[2]);
+						td->loc= bezt->vec[2];
+						VECCOPY(td->center, bezt->vec[1]);
+						if(bezt->f3 & 1) td->flag= TD_SELECTED;
+						else td->flag= 0;
+						td->ext = NULL;
+						td->tdi = NULL;
+						td->val = NULL;
+
+						Mat3CpyMat3(td->smtx, smtx);
+						Mat3CpyMat3(td->mtx, mtx);
+
+						td++;
+						count++;
+					}
+				}
+			}
+			if (propmode)
+				calc_distanceCurveVerts(td-(nu->pntsu*3), td-1);
+		}
+		else {
+			for(a= nu->pntsu*nu->pntsv, bp= nu->bp; a>0; a--, bp++) {
+				if(bp->hide==0) {
+					if(propmode || (bp->f1 & 1)) {
+						VECCOPY(td->iloc, bp->vec);
+						td->loc= bp->vec;
+						VECCOPY(td->center, td->loc);
+						if(bp->f1 & 1) td->flag= TD_SELECTED;
+						else td->flag= 0;
+						td->ext = NULL;
+						td->tdi = NULL;
+						td->val = &(bp->alfa);
+						td->ival = bp->alfa;
+
+						Mat3CpyMat3(td->smtx, smtx);
+						Mat3CpyMat3(td->mtx, mtx);
+
+						td++;
+						count++;
+					}
+				}
+			}
+			if (propmode)
+				calc_distanceCurveVerts(td-(nu->pntsu*nu->pntsv), td-1);
+		}
+	}
+}
+
+/* ********************* lattice *************** */
+
+static void createTransLatticeVerts(TransInfo *t)
+{
+	TransData *td = NULL;
+	BPoint *bp;
+	float mtx[3][3], smtx[3][3];
+	int a;
+	int count=0, countsel=0;
+	int propmode = t->flag & T_PROP_EDIT;
+
+	bp= editLatt->def;
+	a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
+	while(a--) {
+		if(bp->f1 & 1) countsel++;
+		if(propmode) count++;
+		bp++;
+	}
+	
+ 	/* note: in prop mode we need at least 1 selected */
+	if (countsel==0) return;
+	
+	if(propmode) t->total = count; 
+	else t->total = countsel;
+	t->data= MEM_mallocN(t->total*sizeof(TransData), "TransObData(Lattice EditMode)");
+	
+	Mat3CpyMat4(mtx, G.obedit->obmat);
+	Mat3Inv(smtx, mtx);
+
+	td = t->data;
+	bp= editLatt->def;
+	a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
+	while(a--) {
+		if(propmode || (bp->f1 & 1)) {
+			if(bp->hide==0) {
+				VECCOPY(td->iloc, bp->vec);
+				td->loc= bp->vec;
+				VECCOPY(td->center, td->loc);
+				if(bp->f1 & 1) td->flag= TD_SELECTED;
+				else td->flag= 0;
+				Mat3CpyMat3(td->smtx, smtx);
+				Mat3CpyMat3(td->mtx, mtx);
+
+				td->ext = NULL;
+				td->tdi = NULL;
+				td->val = NULL;
+
+				td++;
+				count++;
+			}
+		}
+		bp++;
+	}
+} 
+
+/* ********************* mesh ****************** */
+
+/* proportional distance based on connectivity  */
+#define E_VEC(a)	(vectors + (3 * (int)(a)->vn))
+#define E_NEAR(a)	(nears[((int)(a)->vn)])
+static void editmesh_set_connectivity_distance(int total, float *vectors, EditVert **nears)
+{
+	EditMesh *em = G.editMesh;
+	EditVert *eve;
+	EditEdge *eed;
+	int i= 0, done= 1;
+
+	/* f2 flag is used for 'selection' */
+	/* vn is offset on scratch array   */
+	for(eve= em->verts.first; eve; eve= eve->next) {
+		if(eve->h==0) {
+			eve->vn = (EditVert *)(i++);
+
+			if(eve->f & SELECT) {
+				eve->f2= 2;
+				E_NEAR(eve) = eve;
+				E_VEC(eve)[0] = 0.0f;
+				E_VEC(eve)[1] = 0.0f;
+				E_VEC(eve)[2] = 0.0f;
+			}
+			else {
+				eve->f2 = 0;
+			}
+		}
+	}
+
+
+	/* Floodfill routine */
+	/*
+	At worst this is n*n of complexity where n is number of edges 
+	Best case would be n if the list is ordered perfectly.
+	Estimate is n log n in average (so not too bad)
+	*/
+	while(done) {
+		done= 0;
+		
+		for(eed= em->edges.first; eed; eed= eed->next) {
+			if(eed->h==0) {
+				EditVert *v1= eed->v1, *v2= eed->v2;
+				float *vec2 = E_VEC(v2);
+				float *vec1 = E_VEC(v1);
+
+				if (v1->f2 + v2->f2 == 4)
+					continue;
+
+				if (v1->f2) {
+					if (v2->f2) {
+						float nvec[3];
+						float len1 = VecLength(vec1);
+						float len2 = VecLength(vec2);
+						float lenn;
+						/* for v2 if not selected */
+						if (v2->f2 != 2) {
+							VecSubf(nvec, v2->co, E_NEAR(v1)->co);
+							lenn = VecLength(nvec);
+							if (lenn - len1 > 0.00001f && len2 - lenn > 0.00001f) {
+								VECCOPY(vec2, nvec);
+								E_NEAR(v2) = E_NEAR(v1);
+								done = 1;
+							}
+							else if (len2 - len1 > 0.00001f && len1 - lenn > 0.00001f) {
+								VECCOPY(vec2, vec1);
+								E_NEAR(v2) = E_NEAR(v1);
+								done = 1;
+							}
+						}
+						/* for v1 if not selected */
+						if (v1->f2 != 2) {
+							VecSubf(nvec, v1->co, E_NEAR(v2)->co);
+							lenn = VecLength(nvec);
+							if (lenn - len2 > 0.00001f && len1 - lenn > 0.00001f) {
+								VECCOPY(vec1, nvec);
+								E_NEAR(v1) = E_NEAR(v2);
+								done = 1;
+							}
+							else if (len1 - len2 > 0.00001f && len2 - lenn > 0.00001f) {
+								VECCOPY(vec1, vec2);
+								E_NEAR(v1) = E_NEAR(v2);
+								done = 1;
+							}
+						}
+					}
+					else {
+						v2->f2 = 1;
+						VecSubf(vec2, v2->co, E_NEAR(v1)->co);
+						if (VecLength(vec1) - VecLength(vec2) > 0.00001f) {
+							VECCOPY(vec2, vec1);
+						}
+						E_NEAR(v2) = E_NEAR(v1);
+						done = 1;
+					}
+				}
+				else if (v2->f2) {
+					v1->f2 = 1;
+					VecSubf(vec1, v1->co, E_NEAR(v2)->co);
+					if (VecLength(vec2) - VecLength(vec1) > 0.00001f) {
+						VECCOPY(vec1, vec2);
+					}
+					E_NEAR(v1) = E_NEAR(v2);
+					done = 1;
+				}
+			}
+		}
+	}
+}
+
+
+static void VertsToTransData(TransData *td, EditVert *eve)
+{
+	td->flag = 0;
+	td->loc = eve->co;
+	VECCOPY(td->center, td->loc);
+	VECCOPY(td->iloc, td->loc);
+
+	// Setting normals
+	VECCOPY(td->axismtx[2], eve->no);
+	td->axismtx[0][0]		=
+		td->axismtx[0][1]	=
+		td->axismtx[0][2]	=
+		td->axismtx[1][0]	=
+		td->axismtx[1][1]	=
+		td->axismtx[1][2]	= 0.0f;
+
+	td->ext = NULL;
+	td->tdi = NULL;
+	td->val = NULL;
+}
+
+static void createTransEditVerts(TransInfo *t)
+{
+	TransData *tob = NULL;
+	EditMesh *em = G.editMesh;
+	EditVert *eve;
+	EditVert **nears = NULL;
+	float *vectors = NULL;
+	float mtx[3][3], smtx[3][3];
+	int count=0, countsel=0;
+	int propmode = t->flag & T_PROP_EDIT;
+		
+	// transform now requires awareness for select mode, so we tag the f1 flags in verts
+	if(G.scene->selectmode & SCE_SELECT_VERTEX) {
+		for(eve= em->verts.first; eve; eve= eve->next) {
+			if(eve->h==0 && (eve->f & SELECT)) 
+				eve->f1= SELECT;
+			else
+				eve->f1= 0;
+		}
+	}
+	else if(G.scene->selectmode & SCE_SELECT_EDGE) {
+		EditEdge *eed;
+		for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0;
+		for(eed= em->edges.first; eed; eed= eed->next) {
+			if(eed->h==0 && (eed->f & SELECT))
+				eed->v1->f1= eed->v2->f1= SELECT;
+		}
+	}
+	else {
+		EditFace *efa;
+		for(eve= em->verts.first; eve; eve= eve->next) eve->f1= 0;
+		for(efa= em->faces.first; efa; efa= efa->next) {
+			if(efa->h==0 && (efa->f & SELECT)) {
+				efa->v1->f1= efa->v2->f1= efa->v3->f1= SELECT;
+				if(efa->v4) efa->v4->f1= SELECT;
+			}
+		}
+	}
+	
+	/* now we can count */
+	for(eve= em->verts.first; eve; eve= eve->next) {
+		if(eve->h==0) {
+			if(eve->f1) countsel++;
+			if(propmode) count++;
+		}
+	}
+	
+ 	/* note: in prop mode we need at least 1 selected */
+	if (countsel==0) return;
+	
+	if(propmode) {
+		t->total = count; 
+	
+		/* allocating scratch arrays */
+		vectors = (float *)malloc(t->total * 3 * sizeof(float));
+		nears = (EditVert**)malloc(t->total * sizeof(EditVert*));
+	}
+	else t->total = countsel;
+	tob= t->data= MEM_mallocN(t->total*sizeof(TransData), "TransObData(Mesh EditMode)");
+	
+	Mat3CpyMat4(mtx, G.obedit->obmat);
+	Mat3Inv(smtx, mtx);
+
+	if(propmode) editmesh_set_connectivity_distance(t->total, vectors, nears);
+	
+	for (eve=em->verts.first; eve; eve=eve->next) {
+		if(eve->h==0) {
+			if(propmode || eve->f1) {
+				VertsToTransData(tob, eve);
+
+				if(eve->f1) tob->flag |= TD_SELECTED;
+				if(propmode) {
+					if (eve->f2) {
+						float vec[3];
+						VECCOPY(vec, E_VEC(eve));
+						Mat3MulVecfl(mtx, vec);
+						tob->dist= VecLength(vec);
+					}
+					else {
+						tob->flag |= TD_NOTCONNECTED;
+						tob->dist = MAXFLOAT;
+					}
+				}
+				
+				Mat3CpyMat3(tob->smtx, smtx);
+				Mat3CpyMat3(tob->mtx, mtx);
+
+				tob++;
+			}
+		}	
+	}
+	if (propmode) {
+		free(vectors);
+		free(nears);
+	}
+
+}
+
+/* **************** IpoKey stuff, for Object TransData ********** */
+
+/* storage of bezier triple. thats why -3 and +3! */
+static void set_tdi_old(float *old, float *poin)
+{
+	old[0]= *(poin);
+	old[3]= *(poin-3);
+	old[6]= *(poin+3);
+}
+
+/* while transforming */
+void add_tdi_poin(float *poin, float *old, float delta)
+{
+	if(poin) {
+		poin[0]= old[0]+delta;
+		poin[-3]= old[3]+delta;
+		poin[3]= old[6]+delta;
+	}
+}
+
+/* fill ipokey transdata with old vals and pointers */
+static void ipokey_to_transdata(IpoKey *ik, TransData *td)
+{
+	extern int ob_ar[];		// blenkernel ipo.c
+	TransDataIpokey *tdi= td->tdi;
+	BezTriple *bezt;
+	int a, delta= 0;
+	
+	for(a=0; a<OB_TOTIPO; a++) {
+		if(ik->data[a]) {
+			bezt= ik->data[a];
+			
+			switch( ob_ar[a] ) {
+				case OB_LOC_X:
+				case OB_DLOC_X:
+					tdi->locx= &(bezt->vec[1][1]); break;
+				case OB_LOC_Y:
+				case OB_DLOC_Y:
+					tdi->locy= &(bezt->vec[1][1]); break;
+				case OB_LOC_Z:
+				case OB_DLOC_Z:
+					tdi->locz= &(bezt->vec[1][1]); break;
+					
+				case OB_DROT_X:
+					delta= 1;
+				case OB_ROT_X:
+					tdi->rotx= &(bezt->vec[1][1]); break;
+				case OB_DROT_Y:
+					delta= 1;
+				case OB_ROT_Y:
+					tdi->roty= &(bezt->vec[1][1]); break;
+				case OB_DROT_Z:
+					delta= 1;
+				case OB_ROT_Z:
+					tdi->rotz= &(bezt->vec[1][1]); break;
+					
+				case OB_SIZE_X:
+				case OB_DSIZE_X:
+					tdi->sizex= &(bezt->vec[1][1]); break;
+				case OB_SIZE_Y:
+				case OB_DSIZE_Y:
+					tdi->sizey= &(bezt->vec[1][1]); break;
+				case OB_SIZE_Z:
+				case OB_DSIZE_Z:
+					tdi->sizez= &(bezt->vec[1][1]); break;		
+			}	
+		}
+	}
+	
+	/* oldvals for e.g. undo */
+	if(tdi->locx) set_tdi_old(tdi->oldloc, tdi->locx);
+	if(tdi->locy) set_tdi_old(tdi->oldloc+1, tdi->locy);
+	if(tdi->locz) set_tdi_old(tdi->oldloc+2, tdi->locz);
+	
+	/* remember, for mapping curves ('1'=10 degrees)  */
+	if(tdi->rotx) set_tdi_old(tdi->oldrot, tdi->rotx);
+	if(tdi->roty) set_tdi_old(tdi->oldrot+1, tdi->roty);
+	if(tdi->rotz) set_tdi_old(tdi->oldrot+2, tdi->rotz);
+	
+	/* this is not allowed to be dsize! */
+	if(tdi->sizex) set_tdi_old(tdi->oldsize, tdi->sizex);
+	if(tdi->sizey) set_tdi_old(tdi->oldsize+1, tdi->sizey);
+	if(tdi->sizez) set_tdi_old(tdi->oldsize+2, tdi->sizez);
+	
+	tdi->flag= TOB_IPO;
+	if(delta) tdi->flag |= TOB_IPODROT;
+}
+
+
+/* *************************** Object Transform data ******************* */
+
+static void ObjectToTransData(TransData *td, Object *ob) 
+{
+	float obmtx[3][3];
+	Object *tr;
+	void *cfirst, *clast;
+
+	cfirst = ob->constraints.first;
+	clast = ob->constraints.last;
+	ob->constraints.first=ob->constraints.last=NULL;
+
+	tr= ob->track;
+	ob->track= NULL;
+
+	where_is_object(ob);
+
+	ob->track= tr;
+
+	ob->constraints.first = cfirst;
+	ob->constraints.last = clast;
+
+	td->ob = ob;
+
+	td->loc = ob->loc;
+	VECCOPY(td->iloc, td->loc);
+	
+	td->ext->rot = ob->rot;
+	VECCOPY(td->ext->irot, ob->rot);
+	VECCOPY(td->ext->drot, ob->drot);
+	
+	td->ext->size = ob->size;
+	VECCOPY(td->ext->isize, ob->size);
+	VECCOPY(td->ext->dsize, ob->dsize);
+
+	VECCOPY(td->center, ob->obmat[3]);
+
+	Mat3CpyMat4(td->axismtx, ob->obmat);
+	Mat3Ortho(td->axismtx);
+
+	if (ob->parent)
+	{
+		float totmat[3][3], obinv[3][3];
+		
+		/* we calculate smtx without obmat: so a parmat */
+		object_to_mat3(ob, obmtx);
+		Mat3CpyMat4(totmat, ob->obmat);
+		Mat3Inv(obinv, totmat);
+		Mat3MulMat3(td->smtx, obmtx, obinv);
+		Mat3Inv(td->mtx, td->smtx);
+	}
+	else
+	{
+		Mat3One(td->smtx);
+		Mat3One(td->mtx);
+	}
+}
+
+/* only used in function below, stuff to be removed */
+static Object *is_a_parent_selected_int(Object *startob, Object *ob, GHash *done_hash) 
+{
+	if (ob!=startob && TESTBASE(ob))
+		return ob;
+	
+	if (BLI_ghash_haskey(done_hash, ob))
+		return NULL;
+	else
+		BLI_ghash_insert(done_hash, ob, NULL);
+	
+	if (ob->parent) {
+		Object *par= is_a_parent_selected_int(startob, ob->parent, done_hash);
+		if (par)
+			return par;
+	}
+	return NULL;
+}
+
+/* only used in function below, stuff to be removed */
+static Object *is_a_parent_selected(Object *ob) 
+{
+	GHash *gh= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+	Object *res= is_a_parent_selected_int(ob, ob, gh);
+	BLI_ghash_free(gh, NULL, NULL);
+	
+	return res;
+}
+
+
+
+/* sets flags in Bases to define whether they take part in transform */
+/* it deselects Bases, so we have to call the clear function always after */
+static void set_trans_object_base_flags(TransInfo *t)
+{
+	/*
+	 if Base selected and has parent selected:
+	 base->flag= BA_WASSEL+BA_PARSEL
+	 if base not selected and parent selected:
+	 base->flag= BA_PARSEL
+	 */
+	GHash *object_to_base_hash= NULL; 
+	Base *base;
+	
+	/* moved to start of function, it is needed for hooks now too */
+	if (!object_to_base_hash) {
+		Base *b;
+		object_to_base_hash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+		
+		for (b= FIRSTBASE; b; b= b->next)
+			BLI_ghash_insert(object_to_base_hash, b->object, b);
+	}
+	
+	/* makes sure base flags and object flags are identical */
+	copy_baseflags();
+	
+	for (base= FIRSTBASE; base; base= base->next) {
+		base->flag &= ~(BA_PARSEL+BA_WASSEL);
+		
+		if( (base->lay & G.vd->lay) && base->object->id.lib==0) {
+			Object *ob= base->object;
+			Object *parsel= is_a_parent_selected(ob);
+			
+			/* parentkey here? */
+			
+			if(parsel) {
+				if(base->flag & SELECT) {
+					base->flag &= ~SELECT;
+					base->flag |= (BA_PARSEL+BA_WASSEL);
+				}
+				else base->flag |= BA_PARSEL;
+			}
+			
+			if(t->mode==TFM_TRANSLATION)  {
+				if(ob->track && TESTBASE(ob->track) && (base->flag & SELECT)==0)  
+					base->flag |= BA_PARSEL;
+			}
+			
+			/* updates? */
+			if(ob->hooks.first) {
+				Base *b;
+				ObHook *hook= ob->hooks.first;
+				
+				while(hook) {
+					if(hook->parent) {
+						Object *parsel= is_a_parent_selected(hook->parent);
+						
+						b= BLI_ghash_lookup(object_to_base_hash, hook->parent);
+						if(parsel || ((base->flag | b->flag) & (SELECT | BA_PARSEL)) ) {
+							base->flag |= BA_DISP_UPDATE;
+						}
+					}
+					hook= hook->next;
+				}
+			}
+			
+			if(ob->parent && ob->parent->type==OB_LATTICE)
+				if(ob->parent->hooks.first) base->flag |= BA_DISP_UPDATE;
+			
+			if(base->flag & (SELECT | BA_PARSEL)) {
+				
+				base->flag |= BA_WHERE_UPDATE;
+				
+				if(ob->parent) {
+					if(ob->parent->type==OB_LATTICE) base->flag |= BA_DISP_UPDATE;
+					else if(ob->partype==PARSKEL) {
+						if ELEM3(ob->parent->type, OB_IKA, OB_CURVE, OB_ARMATURE) 
+							base->flag |= BA_DISP_UPDATE;
+					}
+				}
+				if(ob->track) {
+					;
+				}
+				
+				if( give_parteff(ob) ) base->flag |= BA_DISP_UPDATE;
+				
+				if(ob->type==OB_MBALL) {
+					Base *b;
+					
+					b= BLI_ghash_lookup(object_to_base_hash, find_basis_mball(ob));
+					b->flag |= BA_DISP_UPDATE;
+				}
+			}
+		}
+	}
+	
+	if (object_to_base_hash)
+		BLI_ghash_free(object_to_base_hash, NULL, NULL);
+	
+}
+
+void clear_trans_object_base_flags(void)
+{
+	Base *base;
+	
+	base= FIRSTBASE;
+	while(base) {
+		if(base->flag & BA_WASSEL) base->flag |= SELECT;
+		base->flag &= ~(BA_PARSEL+BA_WASSEL);
+		
+		base->flag &= ~(BA_DISP_UPDATE+BA_WHERE_UPDATE+BA_DO_IPO);
+		
+		/* pose here? */
+		if (base->object->pose) {
+			Object *ob= base->object;
+			bPoseChannel *chan;
+			for (chan = ob->pose->chanbase.first; chan; chan=chan->next) {
+				chan->flag &= ~PCHAN_TRANS_UPDATE;
+			}
+		}
+		
+		base= base->next;
+	}
+	copy_baseflags();
+}
+
+
+static void createTransObject(TransInfo *t)
+{
+	TransData *td = NULL;
+	TransDataExtension *tx;
+	Object *ob;
+	Base *base;
+	IpoKey *ik;
+	ListBase elems;
+	
+	/* hackish... but we have to do it somewhere */
+	reset_slowparents();
+	
+	set_trans_object_base_flags(t);
+
+	/* this has to be done, or else constraints on armature
+	 * bones that point to objects/bones that are outside
+	 * of the armature don't work outside of posemode 
+	 * (and yes, I know it's confusing ...).
+	 */
+	figure_pose_updating();
+
+	/* count */	
+	for(base= FIRSTBASE; base; base= base->next) {
+		if TESTBASELIB(base) {
+			ob= base->object;
+			
+			/* store ipo keys? */
+			if(ob->ipo && ob->ipo->showkey && (ob->ipoflag & OB_DRAWKEY)) {
+				elems.first= elems.last= NULL;
+				make_ipokey_transform(ob, &elems, 1); /* '1' only selected keys */
+				
+				pushdata(&elems, sizeof(ListBase));
+				
+				for(ik= elems.first; ik; ik= ik->next) t->total++;
+
+				if(elems.first==NULL) t->total++;
+			}
+			else {
+				t->total++;
+			}
+		}
+	}
+
+	if(!t->total) {
+		/* clear here, main transform function escapes too */
+		clear_trans_object_base_flags();
+		return;
+	}
+	
+	td = t->data = MEM_mallocN(t->total*sizeof(TransData), "TransOb");
+	tx = t->ext = MEM_mallocN(t->total*sizeof(TransDataExtension), "TransObExtension");
+
+	for(base= FIRSTBASE; base; base= base->next) {
+		if TESTBASELIB(base) {
+			ob= base->object;
+			
+			td->flag= TD_SELECTED;
+			td->ext = tx;
+
+			/* store ipo keys? */
+			if(ob->ipo && ob->ipo->showkey && (ob->ipoflag & OB_DRAWKEY)) {
+				
+				popfirst(&elems);	// bring back pushed listbase
+				
+				if(elems.first) {
+					float cfraont;
+					int ipoflag;
+					
+					base->flag |= BA_DO_IPO+BA_WASSEL;
+					base->flag &= ~SELECT;
+					
+					cfraont= CFRA;
+					set_no_parent_ipo(1);
+					ipoflag= ob->ipoflag;
+					ob->ipoflag &= ~OB_OFFS_OB;
+					
+					pushdata(ob->loc, 7*3*4); // tsk! tsk!
+					
+					for(ik= elems.first; ik; ik= ik->next) {
+						
+						/* weak... this doesn't correct for floating values, giving small errors */
+						CFRA= (short)(ik->val/G.scene->r.framelen);
+						
+						do_ob_ipo(ob);
+						ObjectToTransData(td, ob);	// does where_is_object()
+						
+						td->tdi= MEM_callocN(sizeof(TransDataIpokey), "TransDataIpokey");
+						/* also does tdi->flag and oldvals, needs to be after ob_to_transob()! */
+						ipokey_to_transdata(ik, td);
+						
+						td++;
+						tx++;
+						if(ik->next) td->ext= tx;	// prevent corrupting mem!
+					}
+					free_ipokey(&elems);
+					
+					poplast(ob->loc);
+					set_no_parent_ipo(0);
+					
+					CFRA= (short)cfraont;
+					ob->ipoflag= ipoflag;
+				}
+				else {
+					ObjectToTransData(td, ob);
+					td->tdi = NULL;
+					td->val = NULL;
+				}
+			}
+			else {
+				ObjectToTransData(td, ob);
+				td->tdi = NULL;
+				td->val = NULL;
+			}
+			td++;
+			tx++;
+		}
+	}
+}
+
+void createTransData(TransInfo *t) 
+{
+	if (t->context == CTX_TEXTURE) {
+		t->flag |= T_TEXTURE;
+		createTransTexspace(t);
+	}
+	else if (t->context == CTX_EDGE) {
+		t->ext = NULL;
+		t->flag |= T_EDIT;
+		createTransEdge(t);
+		if(t->data && t->flag & T_PROP_EDIT) {
+			sort_trans_data(t);	// makes selected become first in array
+			set_prop_dist(t, 1);
+			sort_trans_data_dist(t);
+		}
+	}
+	else if (G.obpose) {
+		t->flag |= T_POSE;
+		createTransPose(t);
+	}
+	else if (G.obedit) {
+		t->ext = NULL;
+		if (G.obedit->type == OB_MESH) {
+			if(t->mode==TFM_SHRINKFATTEN && (t->context & CTX_NO_NOR_RECALC)==0)
+				vertexnormals(0);
+			createTransEditVerts(t);	
+   		}
+		else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) {
+			createTransCurveVerts(t);
+		}
+		else if (G.obedit->type==OB_LATTICE) {
+			createTransLatticeVerts(t);
+		}
+		else if (G.obedit->type==OB_MBALL) {
+			createTransMBallVerts(t);
+		}
+		else if (G.obedit->type==OB_ARMATURE) {
+			createTransArmatureVerts(t);
+  		}					  		
+		else {
+			printf("not done yet! only have mesh surface curve\n");
+		}
+
+		if(t->data && t->flag & T_PROP_EDIT) {
+			if (ELEM(G.obedit->type, OB_CURVE, OB_MESH)) {
+				sort_trans_data(t);	// makes selected become first in array
+				set_prop_dist(t, 0);
+				sort_trans_data_dist(t);
+			}
+			else {
+				sort_trans_data(t);	// makes selected become first in array
+				set_prop_dist(t, 1);
+				sort_trans_data_dist(t);
+			}
+		}
+		t->flag |= T_EDIT;
+	}
+	else {
+		createTransObject(t);
+		t->flag |= T_OBJECT;
+	}
+
+	if((t->flag & T_OBJECT) && G.vd->camera==OBACT && G.vd->persp>1) {
+		t->flag |= T_CAMERA;
+	}
+}
+
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c
index 40c79d64a27..97f6996902e 100755
--- a/source/blender/src/transform_generics.c
+++ b/source/blender/src/transform_generics.c
@@ -103,8 +103,6 @@
 #include "mydevice.h"
 
 #include "transform.h"
-#include "transform_generics.h"
-#include "transform_constraints.h"
 
 extern ListBase editNurb;
 extern ListBase editelems;
diff --git a/source/blender/src/transform_generics.h b/source/blender/src/transform_generics.h
deleted file mode 100755
index 12948fcbc3f..00000000000
--- a/source/blender/src/transform_generics.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef TRANSFORM_GENERICS_H
-#define TRANSFORM_GENERICS_H
-
-void recalcData(TransInfo *t);
-
-void initTransModeFlags(TransInfo *t, int mode);
-
-void drawLine(float *center, float *dir, char axis, short options);
-
-/* DRAWLINE options flags */
-#define DRAWLIGHT	1
-#define DRAWDASHED	2
-#define DRAWBOLD	4
-
-void apply_grid1(float *val, int max_index, float factor);
-void apply_grid2(float *val, int max_index, float factor, float factor2);
-void apply_grid3(float *val, int max_index, float fac1, float fac2, float fac3);
-
-void applyTransObjects(TransInfo *t);
-void restoreTransObjects(TransInfo *t);
-
-void initTrans(TransInfo *t);
-void postTrans (TransInfo *t);
-
-void calculateCenterBound(TransInfo *t);
-void calculateCenterMedian(TransInfo *t);
-void calculateCenterCursor(TransInfo *t);
-
-void calculateCenter(TransInfo *t);
-
-void calculatePropRatio(TransInfo *t);
-
-void snapGrid(TransInfo *t, float *val);
-
-void getViewVector(float coord[3], float vec[3]);
-
-TransInfo * BIF_GetTransInfo(void);
-
-#endif
-
diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c
index 10af63f862f..f473de04698 100644
--- a/source/blender/src/transform_manipulator.c
+++ b/source/blender/src/transform_manipulator.c
@@ -81,7 +81,6 @@
 
 #include "blendef.h"
 #include "transform.h"
-#include "transform_generics.h"
 
 /* return codes for select, and drawing flags */
 
@@ -306,7 +305,7 @@ static int calc_manipulator(ScrArea *sa)
 		Trans.mode= TFM_ROTATION;	// mislead counting bones... bah
 		
 		/* count total */
-		count_bone_select(&arm->bonebase, &totsel);
+		count_bone_select(&Trans, &arm->bonebase, &totsel);
 		if(totsel) {
 			/* recursive get stats */
 			stats_pose(&arm->bonebase, normal, plane);
diff --git a/source/blender/src/transform_numinput.c b/source/blender/src/transform_numinput.c
index 262ff79c64b..b070031a7df 100755
--- a/source/blender/src/transform_numinput.c
+++ b/source/blender/src/transform_numinput.c
@@ -52,7 +52,6 @@
 
 #include "BLI_arithb.h"
 
-#include "transform_numinput.h"
 #include "transform.h"
 
 /* ************************** Functions *************************** */
diff --git a/source/blender/src/transform_numinput.h b/source/blender/src/transform_numinput.h
deleted file mode 100755
index 36114c7cc71..00000000000
--- a/source/blender/src/transform_numinput.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef TRANSFORM_NUMINPUT_H
-#define TRANSFORM_NUMINPUT_H
-
-typedef struct NumInput {
-    short  idx;
-    short  idx_max;
-    short  flag;        /* Different flags to indicate different behaviors                                */
-    float  val[3];       /* Direct value of the input                                                      */
-    short  ctrl[3];      /* Control to indicate what to do with the numbers that are typed                 */
-} NumInput ;
-
-/*
-	The ctrl value has different meaning:
-		0			: No value has been typed
-		
-		otherwise, |value| - 1 is where the cursor is located after the period
-		Positive	: number is positive
-		Negative	: number is negative
-*/
-
-void outputNumInput(NumInput *n, char *str);
-
-short hasNumInput(NumInput *n);
-
-void applyNumInput(NumInput *n, float *vec);
-
-char handleNumInput(NumInput *n, unsigned short event);
-
-#endif
-