sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Modeling: add optional angle limit for beauty fill

Browse Source 
Makes this tool more useful on an entire mesh by only applying
beautify to planar surfaces.
This commit is contained in:
Campbell Barton 2013-12-14 23:22:35 +11:00
parent ab9fabdfc6
commit 60a6b2422d
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/editors/mesh/editmesh_tools.c
View File

@ -3120,10 +3120,31 @@ static int edbm_beautify_fill_exec(bContext *C, wmOperator *op)
Object *obedit = CTX_data_edit_object(C); Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BKE_editmesh_from_object(obedit); BMEditMesh *em = BKE_editmesh_from_object(obedit);
const float angle_max = M_PI;
const float angle_limit = RNA_float_get(op->ptr, "angle_limit");
char hflag;
if (angle_limit >= angle_max) {
hflag = BM_ELEM_SELECT;
}
else {
BMIter iter;
BMEdge *e;
BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
BM_elem_flag_set(e, BM_ELEM_TAG,
(BM_elem_flag_test(e, BM_ELEM_SELECT) &&
BM_edge_calc_face_angle_ex(e, angle_max) < angle_limit));
}
hflag = BM_ELEM_TAG;
}
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(
em, op, "geom.out", true, em, op, "geom.out", true,
"beautify_fill faces=%hf edges=ae", "beautify_fill faces=%hf edges=%he",
BM_ELEM_SELECT)) BM_ELEM_SELECT, hflag))
{ {
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
@ -3135,6 +3156,8 @@ static int edbm_beautify_fill_exec(bContext *C, wmOperator *op)
void MESH_OT_beautify_fill(wmOperatorType *ot) void MESH_OT_beautify_fill(wmOperatorType *ot)
{ {
PropertyRNA *prop;
/* identifiers */ /* identifiers */
ot->name = "Beautify Faces"; ot->name = "Beautify Faces";
ot->idname = "MESH_OT_beautify_fill"; ot->idname = "MESH_OT_beautify_fill";
@ -3146,6 +3169,11 @@ void MESH_OT_beautify_fill(wmOperatorType *ot)
/* flags */ /* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* props */
prop = RNA_def_float_rotation(ot->srna, "angle_limit", 0, NULL, 0.0f, DEG2RADF(180.0f),
"Max Angle", "Angle limit", 0.0f, DEG2RADF(180.0f));
RNA_def_property_float_default(prop, DEG2RADF(180.0f));
} }