Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix memory leak when baking feedback loop detected.

Browse Source
This commit is contained in:
Campbell Barton
2012-09-12 03:11:29 +00:00
parent 380a6174d9
commit 0ee9075e48
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/object/object_bake.c
View File

@@ -1347,6 +1347,8 @@ static void init_bake_internal(BakeRender *bkr, bContext *C)
static void finish_bake_internal(BakeRender *bkr) static void finish_bake_internal(BakeRender *bkr)
{ {
Image *ima;
RE_Database_Free(bkr->re); RE_Database_Free(bkr->re);
/* restore raytrace and AO */ /* restore raytrace and AO */
@@ -1358,17 +1360,21 @@ static void finish_bake_internal(BakeRender *bkr)
if (bkr->prev_r_raytrace == 0) if (bkr->prev_r_raytrace == 0)
bkr->scene->r.mode &= ~R_RAYTRACE; bkr->scene->r.mode &= ~R_RAYTRACE;
if (bkr->result == BAKE_RESULT_OK) {
Image *ima;
/* force OpenGL reload and mipmap recalc */ /* force OpenGL reload and mipmap recalc */
for (ima = G.main->image.first; ima; ima = ima->id.next) { for (ima = G.main->image.first; ima; ima = ima->id.next) {
if (ima->ok == IMA_OK_LOADED) {
ImBuf *ibuf = BKE_image_get_ibuf(ima, NULL); ImBuf *ibuf = BKE_image_get_ibuf(ima, NULL);
if (bkr->result == BAKE_RESULT_OK) {
if (ima->ok == IMA_OK_LOADED) {
if (ibuf) { if (ibuf) {
if (ibuf->userflags & IB_BITMAPDIRTY) { if (ibuf->userflags & IB_BITMAPDIRTY) {
GPU_free_image(ima); GPU_free_image(ima);
imb_freemipmapImBuf(ibuf); imb_freemipmapImBuf(ibuf);
} }
}
}
}
/* freed when baking is done, but if its canceled we need to free here */ /* freed when baking is done, but if its canceled we need to free here */
if (ibuf->userdata) { if (ibuf->userdata) {
@@ -1377,9 +1383,6 @@ static void finish_bake_internal(BakeRender *bkr)
} }
} }
} }
}
}
}
static void *do_bake_render(void *bake_v) static void *do_bake_render(void *bake_v)
{ {