diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-06-23 22:07:53 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-24 19:48:16 +0300 |
| commit | 0dced1af34e2a714475c24357cf93c2b0147f27f (patch) | |
| tree | 18317858fb87bb2f9670fab833c059aaf0db661f /intern/cycles/render/geometry.cpp | |
| parent | b468023aa1b51b2cdef38cd651c7487b9f4d34c4 (diff) | |
Fix T78149: Cycles memory leak rendering animation with Embree
Diffstat (limited to 'intern/cycles/render/geometry.cpp')
| -rw-r--r-- | intern/cycles/render/geometry.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp index 797321f6eff..9da1c083ba2 100644 --- a/intern/cycles/render/geometry.cpp +++ b/intern/cycles/render/geometry.cpp @@ -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(); |