From 6b53e0adbc5fee508da580bdb8feb596e36751bc Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Thu, 25 Jun 2020 11:06:56 +0200 Subject: Better fix for crash ( with gpu only ) on render end/abort introduced in 0dced1a --- intern/cycles/render/geometry.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'intern/cycles/render') 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(); -- cgit v1.2.3