diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-23 07:43:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-23 07:43:02 +0400 |
| commit | b51590d55df4b013a0becf9977eddb33206276ba (patch) | |
| tree | 03decdf489f9e7acf1ccfd2be3b9aab709b5cba3 /source/blender/editors/mesh | |
| parent | 4c4389f6a42ebfe0140de8d1892d9990aa592980 (diff) | |
code cleanup: bmesh subdivide code - BM_mesh_esubdivideflag() & "esubd" bmesh operator was passing a flag about in a fairly confusing way.
since we will eventually have python bmesh operator access better expose this as multiple booleans.
remove remaining editbutflag's
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_loopcut.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 23 | ||||
| -rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 2 |
3 files changed, 14 insertions, 20 deletions
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 45a975e5d52..d7201394855 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -313,10 +313,11 @@ static void ringsel_finish(bContext *C, wmOperator *op) edgering_sel(lcd, cuts, 1); if (lcd->do_cut) { - BM_mesh_esubdivideflag(lcd->ob, em->bm, BM_ELEM_SELECT, 0.0f, - 0.0f, 0, cuts, SUBDIV_SELECT_LOOPCUT, - SUBD_PATH, 0, FALSE, 0); - + BM_mesh_esubdivide(em->bm, BM_ELEM_SELECT, + 0.0f, 0.0f, + cuts, + SUBDIV_SELECT_LOOPCUT, SUBD_PATH, 0, FALSE, 0); + /* force edge slide to edge select mode in in face select mode */ if (em->selectmode & SCE_SELECT_FACE) { if (em->selectmode == SCE_SELECT_FACE) diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index da475f9bdf4..67f387946d5 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -87,25 +87,19 @@ static int edbm_subdivide_exec(bContext *C, wmOperator *op) int cuts = RNA_int_get(op->ptr, "number_cuts"); float smooth = 0.292f * RNA_float_get(op->ptr, "smoothness"); float fractal = RNA_float_get(op->ptr, "fractal") / 2.5f; - int flag = 0; - if (smooth != 0.0f) - flag |= B_SMOOTH; - if (fractal != 0.0f) - flag |= B_FRACTAL; - if (RNA_boolean_get(op->ptr, "quadtri") && RNA_enum_get(op->ptr, "quadcorner") == SUBD_STRAIGHT_CUT) { RNA_enum_set(op->ptr, "quadcorner", SUBD_INNERVERT); } - BM_mesh_esubdivideflag(obedit, em->bm, BM_ELEM_SELECT, - smooth, fractal, - flag, - cuts, 0, RNA_enum_get(op->ptr, "quadcorner"), - RNA_boolean_get(op->ptr, "quadtri"), - TRUE, RNA_int_get(op->ptr, "seed")); + BM_mesh_esubdivide(em->bm, BM_ELEM_SELECT, + smooth, fractal, + cuts, + SUBDIV_SELECT_ORIG, RNA_enum_get(op->ptr, "quadcorner"), + RNA_boolean_get(op->ptr, "quadtri"), TRUE, + RNA_int_get(op->ptr, "seed")); EDBM_update_generic(C, em, TRUE); @@ -2741,10 +2735,9 @@ static int edbm_knife_cut_exec(bContext *C, wmOperator *op) if (mode == KNIFE_MIDPOINT) numcuts = 1; BMO_slot_int_set(&bmop, "numcuts", numcuts); - BMO_slot_int_set(&bmop, "flag", 0); BMO_slot_int_set(&bmop, "quadcornertype", SUBD_STRAIGHT_CUT); - BMO_slot_bool_set(&bmop, "singleedge", FALSE); - BMO_slot_bool_set(&bmop, "gridfill", FALSE); + BMO_slot_bool_set(&bmop, "use_singleedge", FALSE); + BMO_slot_bool_set(&bmop, "use_gridfill", FALSE); BMO_slot_float_set(&bmop, "radius", 0); diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 772e80fff69..27b1cb6ad54 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -49,7 +49,7 @@ struct wmKeyMap; struct wmOperator; struct wmOperatorType; -/* ******************** bmeshutils.c */ +/* ******************** editmesh_utils.c */ /* * ok: the EDBM module is for editmode bmesh stuff. in contrast, the |