From acf26dee5f086fcc547bd3f5c262d6cf977cd835 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 4 Jul 2019 13:11:25 +0200 Subject: Fix T66412: crash with displacement and AO node in viewport renders --- intern/cycles/render/mesh.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'intern') 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(); -- cgit v1.2.3