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

Fix potential memory leak baking

Browse Source
This commit is contained in:
Campbell Barton
2015-10-01 17:19:12 +10:00
parent 22ec991e6b
commit e5117108aa
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

Submodule release/datafiles/locale updated: c651e63a9a...4e1460519f

2
release/scripts/addons

Submodule release/scripts/addons updated: 0eef469a5d...cd26c938e5

2
release/scripts/addons_contrib

Submodule release/scripts/addons_contrib updated: cf842d8bb7...34dc9b5a6a

23
source/blender/render/intern/source/bake_api.c
View File

@@ -591,6 +591,18 @@ void RE_bake_pixels_populate(
if (me->edit_btmesh)
return;
if ((uv_layer == NULL) || (uv_layer[0] == '\0')) {
mloopuv = CustomData_get_layer(&me->ldata, CD_MLOOPUV);
}
else {
int uv_id = CustomData_get_named_layer(&me->ldata, CD_MLOOPUV, uv_layer);
mloopuv = CustomData_get_layer_n(&me->ldata, CD_MTFACE, uv_id);
}
if (mloopuv == NULL)
return;
bd.pixel_array = pixel_array;
bd.zspan = MEM_callocN(sizeof(ZSpan) * bake_images->size, "bake zspan");
@@ -603,17 +615,6 @@ void RE_bake_pixels_populate(
zbuf_alloc_span(&bd.zspan[i], bake_images->data[i].width, bake_images->data[i].height, R.clipcrop);
}
if ((uv_layer == NULL) || (uv_layer[0] == '\0')) {
mloopuv = CustomData_get_layer(&me->ldata, CD_MLOOPUV);
}
else {
int uv_id = CustomData_get_named_layer(&me->ldata, CD_MLOOPUV, uv_layer);
mloopuv = CustomData_get_layer_n(&me->ldata, CD_MTFACE, uv_id);
}
if (mloopuv == NULL)
return;
looptri = MEM_mallocN(sizeof(*looptri) * tottri, __func__);
BKE_mesh_recalc_looptri(