tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix T78149: Cycles memory leak rendering animation with Embree

This commit is contained in:
Brecht Van Lommel 2020-06-23 21:07:53 +02:00
parent b468023aa1
commit 0dced1af34
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
intern/cycles/render/geometry.cpp
View File

@ -1029,23 +1029,14 @@ void GeometryManager::device_update_bvh(Device *device,
VLOG(1) << "Using " << bvh_layout_name(bparams.bvh_layout) << " layout.";
#ifdef WITH_EMBREE
if (bparams.bvh_layout == BVH_LAYOUT_EMBREE) {
if (dscene->data.bvh.scene) {
BVHEmbree::destroy(dscene->data.bvh.scene);
}
}
#endif
BVH *bvh = BVH::create(bparams, scene->geometry, scene->objects);
bvh->build(progress, &device->stats);
if (progress.get_cancel()) {
#ifdef WITH_EMBREE
if (bparams.bvh_layout == BVH_LAYOUT_EMBREE) {
if (dscene->data.bvh.scene) {
BVHEmbree::destroy(dscene->data.bvh.scene);
}
if (dscene->data.bvh.scene) {
BVHEmbree::destroy(dscene->data.bvh.scene);
dscene->data.bvh.scene = NULL;
}
#endif
delete bvh;
@ -1417,6 +1408,13 @@ void GeometryManager::device_update(Device *device,
void GeometryManager::device_free(Device *device, DeviceScene *dscene)
{
#ifdef WITH_EMBREE
if (dscene->data.bvh.scene) {
BVHEmbree::destroy(dscene->data.bvh.scene);
dscene->data.bvh.scene = NULL;
}
#endif
dscene->bvh_nodes.free();
dscene->bvh_leaf_nodes.free();
dscene->object_node.free();