[Bf-blender-cvs] [acf26dee5f0] master: Fix T66412: crash with displacement and AO node in viewport renders

[Brecht Van Lommel]

Commit: acf26dee5f086fcc547bd3f5c262d6cf977cd835
Author: Brecht Van Lommel
Date:   Thu Jul 4 13:11:25 2019 +0200
Branches: master
https://developer.blender.org/rBacf26dee5f086fcc547bd3f5c262d6cf977cd835

Fix T66412: crash with displacement and AO node in viewport renders

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

M	intern/cycles/render/mesh.cpp

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

diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 78b9ec03273..91c3a772537 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -2315,6 +2315,9 @@ void MeshManager::device_free(Device *device, DeviceScene *dscene)
   dscene->attributes_float3.free();
   dscene->attributes_uchar4.free();
 
+  /* Signal for shaders like displacement not to do ray tracing. */
+  dscene->data.bvh.bvh_layout = BVH_LAYOUT_NONE;
+
 #ifdef WITH_OSL
   OSLGlobals *og = (OSLGlobals *)device->osl_memory();