diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-05-27 14:42:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-27 14:43:35 +0300 |
commit | 4bf64e841c94becc4b8d9450b4ab4589079b8915 (patch) | |
tree | 3a346558f08ca455a4d0907aca7798582126d1c5 /source/blender/editors/mesh/editmesh_tools.c | |
parent | 0e00072ff0a95d1205a04b16c54037f371639d3c (diff) |
Correct convex-hull for recent join-tri changes
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 679d0173581..50419cb7347 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -5186,11 +5186,16 @@ static int edbm_convex_hull_exec(bContext *C, wmOperator *op) /* Merge adjacent triangles */ if (RNA_boolean_get(op->ptr, "join_triangles")) { - if (!EDBM_op_call_and_selectf(em, op, - "faces.out", true, - "join_triangles faces=%S limit=%f", - &bmop, "geom.out", - RNA_float_get(op->ptr, "limit"))) + float angle_face_threshold = RNA_float_get(op->ptr, "face_threshold"); + float angle_shape_threshold = RNA_float_get(op->ptr, "shape_threshold"); + + if (!EDBM_op_call_and_selectf( + em, op, + "faces.out", true, + "join_triangles faces=%S " + "angle_face_threshold=%f angle_shape_threshold=%f", + &bmop, "geom.out", + angle_face_threshold, angle_shape_threshold)) { EDBM_op_finish(em, &bmop, op, true); return OPERATOR_CANCELLED; |