diff options
author | Martin Poirier <theeth@yahoo.com> | 2009-12-21 18:37:19 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2009-12-21 18:37:19 +0300 |
commit | 4d32e002edf9075c168a61b5ea4657c982ff23e2 (patch) | |
tree | 2d7366c8bc77114610ea55cf4b3f98ef99e26024 | |
parent | 371571fed6a8d2218be714dac5884d8135935b69 (diff) |
[#20441] 3D manipulator widget problem
calculateTransformCenter function passing event to transform init when it shouldn't have.
-rw-r--r-- | source/blender/editors/include/ED_transform.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 065867a3bb3..6388c4552be 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -95,7 +95,7 @@ enum { * 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; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 3a4dc102943..43caf85e1bc 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -304,7 +304,7 @@ static void viewops_data_create(bContext *C, wmOperator *op, wmEvent *event) 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); } diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 36e8032b640..a6b5e677ca2 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1100,7 +1100,7 @@ int transformEvent(TransInfo *t, wmEvent *event) 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 @@ int calculateTransformCenter(bContext *C, wmEvent *event, int centerMode, float 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 |