diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-09-12 08:03:26 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-09-12 08:03:26 +0400 |
| commit | 56d37e80a321c48e6ea7748e73aca7553dab2bf4 (patch) | |
| tree | e79e58a797cdea88c2701828489ac639745670ce /source/blender/editors/mesh | |
| parent | db017a3b42251e879bb0bd4fa62528bf127490e2 (diff) | |
some bugfixes, merge to cursor didn't work
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/bmesh_tools.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index e02707c7a67..780c65f921b 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -2598,16 +2598,18 @@ static int merge_firstlast(BMEditMesh *em, int first, int uvmerge, wmOperator *w return OPERATOR_FINISHED; } -static int merge_target(BMEditMesh *em, Scene *scene, View3D *v3d, +static int merge_target(BMEditMesh *em, Scene *scene, View3D *v3d, Object *ob, int target, int uvmerge, wmOperator *wmop) { BMIter iter; BMVert *v; - float *co, cent[3] = {0.0f, 0.0f, 0.0f}, fac; + float *vco, co[3], cent[3] = {0.0f, 0.0f, 0.0f}, fac; int i; if (target) { - co = give_cursor(scene, v3d); + vco = give_cursor(scene, v3d); + VECCOPY(co, vco); + Mat4MulVecfl(ob->imat, co); } else { i = 0; BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { @@ -2622,7 +2624,7 @@ static int merge_target(BMEditMesh *em, Scene *scene, View3D *v3d, fac = 1.0f / (float)i; VECMUL(cent, fac); - co = cent; + VECCOPY(co, cent); } if (!co) @@ -2649,10 +2651,10 @@ static int merge_exec(bContext *C, wmOperator *op) switch(RNA_enum_get(op->ptr, "type")) { case 3: - status = merge_target(em, scene, v3d, 0, uvs, op); + status = merge_target(em, scene, v3d, obedit, 0, uvs, op); break; case 4: - status = merge_target(em, scene, v3d, 1, uvs, op); + status = merge_target(em, scene, v3d, obedit, 1, uvs, op); break; case 1: status = merge_firstlast(em, 0, uvs, op); |