Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2020-06-25 00:51:57 +0300
committerJens Verwiebe <info@jensverwiebe.de>2020-06-25 00:51:57 +0300
commitec776f18ff70348fd2b13c70e54843f2ba45b599 (patch)
tree8994692ca850b2707f91fa29db0f0692a50ca2d3 /intern/cycles
parenteace5903cb7d6c77207ad31453aee8e8d151f8b1 (diff)
Fix crashing on render end/abort introduced in 0dced1a
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/render/geometry.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index 9da1c083ba2..291905ac60d 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1409,9 +1409,11 @@ 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;
+ if (dscene->data.bvh.bvh_layout == BVH_LAYOUT_EMBREE) {
+ if (dscene->data.bvh.scene) {
+ BVHEmbree::destroy(dscene->data.bvh.scene);
+ dscene->data.bvh.scene = NULL;
+ }
}
#endif