diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-08 05:32:25 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-08 14:17:33 +0300 |
commit | cdb0b3b1dcd4e9962426422868b2f40535670a5c (patch) | |
tree | 1a3d1727d4da92536d6c3615cbe0f9dffc1315b8 /intern/cycles/kernel/kernel_volume.h | |
parent | 4b3e6cb728cb5d0e603f3b23b32ad1f8bfc68558 (diff) |
Code refactor: use DeviceInfo to enable QBVH and decoupled volume shading.
Diffstat (limited to 'intern/cycles/kernel/kernel_volume.h')
-rw-r--r-- | intern/cycles/kernel/kernel_volume.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h index d9c310a893e..5905fb3bf12 100644 --- a/intern/cycles/kernel/kernel_volume.h +++ b/intern/cycles/kernel/kernel_volume.h @@ -1026,6 +1026,9 @@ ccl_device bool kernel_volume_use_decoupled(KernelGlobals *kg, bool heterogeneou /* decoupled ray marching for heterogeneous volumes not supported on the GPU, * which also means equiangular and multiple importance sampling is not * support for that case */ + if(!kernel_data.integrator.volume_decoupled) + return false; + #ifdef __KERNEL_GPU__ if(heterogeneous) return false; |