[Bf-blender-cvs] [6b53e0adbc5] master: Better fix for crash ( with gpu only ) on render end/abort introduced in 0dced1a

[Jens Verwiebe]

Commit: 6b53e0adbc5fee508da580bdb8feb596e36751bc
Author: Jens Verwiebe
Date:   Thu Jun 25 11:06:56 2020 +0200
Branches: master
https://developer.blender.org/rB6b53e0adbc5fee508da580bdb8feb596e36751bc

Better fix for crash ( with gpu only ) 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 291905ac60d..3e18661ecf7 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1409,12 +1409,11 @@ void GeometryManager::device_update(Device *device,
 void GeometryManager::device_free(Device *device, DeviceScene *dscene)
 {
 #ifdef WITH_EMBREE
-  if (dscene->data.bvh.bvh_layout == BVH_LAYOUT_EMBREE) {
-    if (dscene->data.bvh.scene) {
+  if (dscene->data.bvh.scene) {
+    if (dscene->data.bvh.bvh_layout == BVH_LAYOUT_EMBREE)
       BVHEmbree::destroy(dscene->data.bvh.scene);
-      dscene->data.bvh.scene = NULL;
+    dscene->data.bvh.scene = NULL;
     }
-  }
 #endif
 
   dscene->bvh_nodes.free();