diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-08 12:56:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-08 12:56:46 +0400 |
commit | 61bbefe40d5a1127c06c7fb9efb91a0241ebc410 (patch) | |
tree | a8ca1591acb90206166be5cae46b3fba999698a4 | |
parent | 335fd7388f601e0db347cc64a202c9a166943a57 (diff) |
remove unused normal-recalc flags.
-rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_normals.c | 18 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 2 |
3 files changed, 1 insertions, 20 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 7e4d5e06100..497c9e1c153 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -150,7 +150,6 @@ static BMOpDefine bmo_recalc_face_normals_def = { "recalc_face_normals", /* slots_in */ {{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, - {"use_face_tag", BMO_OP_SLOT_BOOL}, /* Tag faces that have been flipped */ {{'\0'}}, }, {{{'\0'}}}, /* no output */ diff --git a/source/blender/bmesh/operators/bmo_normals.c b/source/blender/bmesh/operators/bmo_normals.c index d238644fb02..88a4d4478be 100644 --- a/source/blender/bmesh/operators/bmo_normals.c +++ b/source/blender/bmesh/operators/bmo_normals.c @@ -38,7 +38,6 @@ #define FACE_VIS 1 #define FACE_FLAG 2 -#define FACE_FLIP 8 /* * put normal to the outside, and set the first direction flags in edges @@ -54,7 +53,6 @@ void bmo_recalc_face_normals_exec(BMesh *bm, BMOperator *op) { BMFace **fstack; STACK_DECLARE(fstack); - const bool use_face_tag = BMO_slot_bool_get(op->slots_in, "use_face_tag"); const unsigned int tot_faces = BMO_slot_buffer_count(op->slots_in, "faces"); unsigned int tot_touch = 0; @@ -96,11 +94,6 @@ void bmo_recalc_face_normals_exec(BMesh *bm, BMOperator *op) /* make sure the starting face has the correct winding */ if (dot_v3v3(f_start_cent, f_start->no) < 0.0f) { BM_face_normal_flip(bm, f_start); - BMO_elem_flag_toggle(bm, f_start, FACE_FLIP); - - if (use_face_tag) { - BM_elem_flag_toggle(f_start, BM_ELEM_TAG); - } } /* now that we've found our starting face, make all connected faces @@ -132,17 +125,6 @@ void bmo_recalc_face_normals_exec(BMesh *bm, BMOperator *op) if (l_other->v == l->v) { BM_face_normal_flip(bm, l_other->f); - - BMO_elem_flag_toggle(bm, l_other->f, FACE_FLIP); - if (use_face_tag) { - BM_elem_flag_toggle(l_other->f, BM_ELEM_TAG); - } - } - else if (BM_elem_flag_test(l_other->f, BM_ELEM_TAG) || BM_elem_flag_test(l->f, BM_ELEM_TAG)) { - if (use_face_tag) { - BM_elem_flag_disable(l->f, BM_ELEM_TAG); - BM_elem_flag_disable(l_other->f, BM_ELEM_TAG); - } } STACK_PUSH(fstack, l_other->f); diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 2fa6812d131..2c721a0a9dc 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -1066,7 +1066,7 @@ static int edbm_normals_make_consistent_exec(bContext *C, wmOperator *op) /* doflip has to do with bmesh_rationalize_normals, it's an internal * thing */ - if (!EDBM_op_callf(em, op, "recalc_face_normals faces=%hf use_face_tag=%b", BM_ELEM_SELECT, true)) + if (!EDBM_op_callf(em, op, "recalc_face_normals faces=%hf", BM_ELEM_SELECT)) return OPERATOR_CANCELLED; if (RNA_boolean_get(op->ptr, "inside")) |