griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#30220] Knife Tool Crashes Blender

Browse Source 
though there is still a memory leak, but it looks like the leak may be in BLI_smallhash.c, not knife code.
This commit is contained in:
Campbell Barton
2012-02-17 02:06:30 +00:00
parent ad22305137
commit 8a2bf0ba54
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/mesh/knifetool.c
View File

@@ -1698,8 +1698,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
ListBase *face_nets = MEM_callocN(sizeof(ListBase)*bm->totface, "face_nets");
BMFace **faces = MEM_callocN(sizeof(BMFace *) * bm->totface, "faces knife");
MemArena *arena = BLI_memarena_new(1 << 16, "knifenet_fill_faces");
SmallHash shash, *hash = &shash;
/* SmallHash shash2, *visited = &shash2; */ /* UNUSED */
SmallHash shash;
int i, j, k = 0, totface = bm->totface;
BMO_push(bm, NULL);
@@ -1800,6 +1799,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
}
for (i = 0; i < totface; i++) {
SmallHash *hash = &shash;
EditFace *efa;
EditVert *eve, *lasteve;
int j;
@@ -1932,7 +1932,6 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
if (faces)
MEM_freeN(faces);
BLI_memarena_free(arena);
BLI_smallhash_release(hash);
BMO_error_clear(bm); /* remerge_faces sometimes raises errors, so make sure to clear them */