diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-04 14:11:25 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-04 14:11:55 +0300 |
commit | acf26dee5f086fcc547bd3f5c262d6cf977cd835 (patch) | |
tree | b8fbd5f374a79a4e2d0efa949978964f90c91008 /intern | |
parent | 33987caf3e9b752a910a616ad95531b067bfb898 (diff) |
Fix T66412: crash with displacement and AO node in viewport renders
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/mesh.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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(); |