diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-27 15:44:40 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-27 15:44:40 +0300 |
| commit | 62fd4395ac594dd02a61982d2bf92839d9810f1b (patch) | |
| tree | 0d96caf8481265bbe6b376961d00f58dbc46845e /source/blender/editors/mesh | |
| parent | 322380999ed91179ebce511c7b14e470b48bf993 (diff) | |
| parent | b52af946cd92993dd6918797214d956070813878 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 15 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 27 |
2 files changed, 20 insertions, 22 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; diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 373b9df75fd..0b9da1efed6 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -1071,26 +1071,19 @@ static BMVert *cache_mirr_intptr_as_bmvert(intptr_t *index_lookup, int index) } /** - * [note: I've decided to use ideasman's code for non-editmode stuff, but since - * it has a big "not for editmode!" disclaimer, I'm going to keep what I have here - * - joeedh] + * Mirror editing API, usage: * - * x-mirror editing api. usage: + * \code{.c} + * EDBM_verts_mirror_cache_begin(em, ...); * - * EDBM_verts_mirror_cache_begin(em); - * ... - * ... - * BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { - * mirrorv = EDBM_verts_mirror_get(em, v); - * } - * ... - * ... - * EDBM_verts_mirror_cache_end(em); + * BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) { + * v_mirror = EDBM_verts_mirror_get(em, v); + * e_mirror = EDBM_verts_mirror_get_edge(em, e); + * f_mirror = EDBM_verts_mirror_get_face(em, f); + * } * - * \param use_self Allow a vertex to reference its self. - * \param use_select Only cache selected verts. - * - * \note why do we only allow x axis mirror editing? + * EDBM_verts_mirror_cache_end(em); + * \endcode */ /* BM_SEARCH_MAXDIST is too big, copied from 2.6x MOC_THRESH, should become a |