[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25501] trunk/blender/source/blender/ editors: [#20441] 3D manipulator widget problem

[Martin Poirier]

Revision: 25501
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25501
Author:   theeth
Date:     2009-12-21 16:37:19 +0100 (Mon, 21 Dec 2009)

Log Message:
-----------
[#20441] 3D manipulator widget problem

calculateTransformCenter function passing event to transform init when it shouldn't have.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/ED_transform.h
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/editors/include/ED_transform.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_transform.h	2009-12-21 11:42:31 UTC (rev 25500)
+++ trunk/blender/source/blender/editors/include/ED_transform.h	2009-12-21 15:37:19 UTC (rev 25501)
@@ -95,7 +95,7 @@
  * returns 1 if successful, 0 otherwise (usually means there's no selection)
  * (if 0 is returns, *vec is unmodified)
  * */
-int calculateTransformCenter(struct bContext *C, struct wmEvent *event, int centerMode, float *vec);
+int calculateTransformCenter(struct bContext *C, int centerMode, float *vec);
 
 struct TransInfo;
 struct ScrArea;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2009-12-21 11:42:31 UTC (rev 25500)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2009-12-21 15:37:19 UTC (rev 25501)
@@ -304,7 +304,7 @@
 	if (vod->use_dyn_ofs) {
 		VECCOPY(vod->ofs, rv3d->ofs);
 		/* If there's no selection, lastofs is unmodified and last value since static */
-		calculateTransformCenter(C, event, V3D_CENTROID, lastofs);
+		calculateTransformCenter(C, V3D_CENTROID, lastofs);
 		VECCOPY(vod->dyn_ofs, lastofs);
 		mul_v3_fl(vod->dyn_ofs, -1.0f);
 	}

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2009-12-21 11:42:31 UTC (rev 25500)
+++ trunk/blender/source/blender/editors/transform/transform.c	2009-12-21 15:37:19 UTC (rev 25501)
@@ -1100,7 +1100,7 @@
 		return OPERATOR_PASS_THROUGH;
 }
 
-int calculateTransformCenter(bContext *C, wmEvent *event, int centerMode, float *vec)
+int calculateTransformCenter(bContext *C, int centerMode, float *vec)
 {
 	TransInfo *t = MEM_callocN(sizeof(TransInfo), "TransInfo data");
 	int success = 1;
@@ -1111,9 +1111,9 @@
 
 	t->mode = TFM_DUMMY;
 
-	initTransInfo(C, t, NULL, event);					// internal data, mouse, vectors
+	initTransInfo(C, t, NULL, NULL);	// internal data, mouse, vectors
 
-	createTransData(C, t);			// make TransData structs from selection
+	createTransData(C, t);				// make TransData structs from selection
 
 	t->around = centerMode; 			// override userdefined mode