diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-16 17:18:14 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-16 17:26:48 +0400 |
commit | 7d45ddae33f41578e07970c95bac5f916819e27d (patch) | |
tree | cb95a514c82afb3655c572befcc5fc8e85f93a9f /source | |
parent | d1b1d194dc9cc741d87dc63e701402de0776c694 (diff) |
Add Edge sharp/smooth to 3DView shading panel, as well as new Vert sharp/smooth.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index e57f6375a2a..90e1c916029 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -823,27 +823,24 @@ static int edbm_mark_sharp_exec(bContext *C, wmOperator *op) BMEdge *eed; BMIter iter; const bool clear = RNA_boolean_get(op->ptr, "clear"); + const bool use_verts = RNA_boolean_get(op->ptr, "use_verts"); /* auto-enable sharp edge drawing */ if (clear == 0) { me->drawflag |= ME_DRAWSHARP; } - if (!clear) { - BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { - if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) + BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { + if (use_verts) { + if (!(BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))) { continue; - - BM_elem_flag_disable(eed, BM_ELEM_SMOOTH); + } } - } - else { - BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) { - if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) - continue; - - BM_elem_flag_enable(eed, BM_ELEM_SMOOTH); + else if (!BM_elem_flag_test(eed, BM_ELEM_SELECT)) { + continue; } + + BM_elem_flag_set(eed, BM_ELEM_SMOOTH, clear); } EDBM_update_generic(em, true, false); @@ -867,11 +864,13 @@ void MESH_OT_mark_sharp(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - prop = RNA_def_boolean(ot->srna, "clear", 0, "Clear", ""); + prop = RNA_def_boolean(ot->srna, "clear", false, "Clear", ""); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); + prop = RNA_def_boolean(ot->srna, "use_verts", false, "Vertices", + "Consider vertices instead of edges to select which edges to (un)tag as sharp"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); } - static int edbm_vert_connect_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); |