[Bf-blender-cvs] [ec776f18ff7] master: Fix crashing on render end/abort introduced in 0dced1a

[Jens Verwiebe]

Commit: ec776f18ff70348fd2b13c70e54843f2ba45b599
Author: Jens Verwiebe
Date:   Wed Jun 24 23:51:57 2020 +0200
Branches: master
https://developer.blender.org/rBec776f18ff70348fd2b13c70e54843f2ba45b599

Fix crashing on render end/abort introduced in 0dced1a

===================================================================

M	intern/cycles/render/geometry.cpp

===================================================================

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