diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-13 03:49:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-13 03:49:56 +0400 |
commit | 880a86230f9dc48a41e3274661c0be847c407b90 (patch) | |
tree | 0161bdd1d7b3324a5520c345715922fbe32648e4 | |
parent | 4a8d4f319f9a68c0006460861a01066a5c35921a (diff) |
bmesh_vert_separate: remove unused return value
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 8 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.h | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_rip.c | 8 | ||||
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_utils.c | 12 |
4 files changed, 12 insertions, 20 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 36ef8ad6f60..51461190233 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1915,7 +1915,7 @@ bool BM_vert_splice(BMesh *bm, BMVert *v, BMVert *v_target) * * \return Success */ -bool bmesh_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len) +void bmesh_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len) { const int v_edgetot = BM_vert_face_count(v); BMEdge **stack = BLI_array_alloca(stack, v_edgetot); @@ -2039,14 +2039,12 @@ bool bmesh_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len if (r_vout != NULL) { *r_vout = verts; } - - return true; } /** * High level function which wraps both #bmesh_vert_separate and #bmesh_edge_separate */ -bool BM_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len, +void BM_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len, BMEdge **e_in, int e_in_len) { int i; @@ -2058,7 +2056,7 @@ bool BM_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len, } } - return bmesh_vert_separate(bm, v, r_vout, r_vout_len); + bmesh_vert_separate(bm, v, r_vout, r_vout_len); } /** diff --git a/source/blender/bmesh/intern/bmesh_core.h b/source/blender/bmesh/intern/bmesh_core.h index b091a4d6437..ea25a5c3ee7 100644 --- a/source/blender/bmesh/intern/bmesh_core.h +++ b/source/blender/bmesh/intern/bmesh_core.h @@ -54,12 +54,12 @@ void bmesh_edge_separate(BMesh *bm, BMEdge *e, BMLoop *l_sep); bool BM_edge_splice(BMesh *bm, BMEdge *e, BMEdge *e_target); bool BM_vert_splice(BMesh *bm, BMVert *v, BMVert *v_target); -bool bmesh_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len); +void bmesh_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len); bool bmesh_loop_reverse(BMesh *bm, BMFace *f); BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del); -bool BM_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len, +void BM_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len, BMEdge **e_in, int e_in_len); /* EULER API - For modifying structure */ diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c index c027c1bbcd1..1128d705e47 100644 --- a/source/blender/editors/mesh/editmesh_rip.c +++ b/source/blender/editors/mesh/editmesh_rip.c @@ -648,11 +648,9 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *eve BM_vert_select_set(bm, v, false); - if (bmesh_vert_separate(bm, v, &vout, &vout_len) == false) { - BKE_report(op->reports, RPT_ERROR, "Error ripping vertex from faces"); - return OPERATOR_CANCELLED; - } - else if (vout_len < 2) { + bmesh_vert_separate(bm, v, &vout, &vout_len); + + if (vout_len < 2) { MEM_freeN(vout); /* set selection back to avoid active-unselected vertex */ BM_vert_select_set(bm, v, true); diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index 55c97b66ffb..d228e1a0646 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -245,14 +245,10 @@ static PyObject *bpy_bm_utils_vert_separate(PyObject *UNUSED(self), PyObject *ar return NULL; } - if (BM_vert_separate(bm, py_vert->v, &elem, &elem_len, edge_array, edge_array_len)) { - /* return collected verts */ - ret = BPy_BMElem_Array_As_Tuple(bm, (BMHeader **)elem, elem_len); - MEM_freeN(elem); - } - else { - ret = PyTuple_New(0); - } + BM_vert_separate(bm, py_vert->v, &elem, &elem_len, edge_array, edge_array_len); + /* return collected verts */ + ret = BPy_BMElem_Array_As_Tuple(bm, (BMHeader **)elem, elem_len); + MEM_freeN(elem); PyMem_FREE(edge_array); |