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

fix for leak in bmesh edge split - assert when invalid args are given rather then returning NULL.

Browse Source
This commit is contained in:
Campbell Barton 2012-03-03 14:48:50 +00:00
parent cbc07986b5
commit 86cec98f9e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/bmesh/intern/bmesh_core.c
View File

@ -1225,9 +1225,8 @@ BMVert *bmesh_semv(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **r_e)
BMVert *nv, *ov;
int i, edok, valence1 = 0, valence2 = 0;
if (bmesh_vert_in_edge(e, tv) == 0) {
return NULL;
}
BLI_assert(bmesh_vert_in_edge(e, tv) != FALSE);
ov = bmesh_edge_other_vert_get(e, tv);
/* count valence of v1 */

12
source/blender/bmesh/intern/bmesh_mods.c
View File

@ -544,6 +544,7 @@ BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float perce
BMEdge *e_dummy;
BLI_array_staticdeclare(oldfaces, 32);
SmallHash hash;
const int do_mdisp = (e->l && CustomData_has_layer(&bm->ldata, CD_MDISPS));
/* we need this for handling multire */
if (!r_e) {
@ -551,7 +552,7 @@ BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float perce
}
/* do we have a multires layer */
if (CustomData_has_layer(&bm->ldata, CD_MDISPS) && e->l) {
if (do_mdisp) {
BMLoop *l;
int i;
@ -572,9 +573,8 @@ BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float perce
v2 = bmesh_edge_other_vert_get(e, v);
nv = bmesh_semv(bm, v, e, r_e);
if (nv == NULL) {
return NULL;
}
BLI_assert(nv != NULL);
sub_v3_v3v3(nv->co, v2->co, v->co);
madd_v3_v3v3fl(nv->co, v->co, nv->co, percent);
@ -588,7 +588,7 @@ BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float perce
BM_data_interp_face_vert_edge(bm, v2, v, nv, e, percent);
BM_data_interp_from_verts(bm, v, v2, nv, percent);
if (CustomData_has_layer(&bm->ldata, CD_MDISPS) && e->l && nv) {
if (do_mdisp) {
int i, j;
/* interpolate new/changed loop data from copied old face */
@ -724,7 +724,7 @@ int BM_edge_rotate_check(BMesh *UNUSED(bm), BMEdge *e)
lb = BM_face_other_vert_loop(e->v2, fb, e->v1);
/* check that the next vert in both faces isnt the same
* (ie - the next edge doesnt sharwe the same faces).
* (ie - the next edge doesnt share the same faces).
* since we can't rotate usefully in this case. */
if (la->v == lb->v) {
return FALSE;