[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59092] trunk/blender/source/blender: bmesh_vert_separate: remove unused return value
Campbell Barton
ideasman42 at gmail.com
Tue Aug 13 01:49:56 CEST 2013
Revision: 59092
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59092
Author: campbellbarton
Date: 2013-08-12 23:49:56 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
bmesh_vert_separate: remove unused return value
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.h
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-08-12 22:36:46 UTC (rev 59091)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-08-12 23:49:56 UTC (rev 59092)
@@ -1915,7 +1915,7 @@
*
* \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 @@
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 @@
}
}
- return bmesh_vert_separate(bm, v, r_vout, r_vout_len);
+ bmesh_vert_separate(bm, v, r_vout, r_vout_len);
}
/**
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.h 2013-08-12 22:36:46 UTC (rev 59091)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.h 2013-08-12 23:49:56 UTC (rev 59092)
@@ -54,12 +54,12 @@
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 */
Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2013-08-12 22:36:46 UTC (rev 59091)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c 2013-08-12 23:49:56 UTC (rev 59092)
@@ -648,11 +648,9 @@
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);
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c 2013-08-12 22:36:46 UTC (rev 59091)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c 2013-08-12 23:49:56 UTC (rev 59092)
@@ -245,14 +245,10 @@
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);
More information about the Bf-blender-cvs
mailing list