diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-29 19:10:37 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-29 19:10:37 +0300 |
| commit | 7778f0ff202147121538e8c08a8fa25d1261470e (patch) | |
| tree | 69f66bf8ffa4223f77576bd57769569a0dc5ba22 /intern/cycles/kernel/geom/geom_qbvh_traversal.h | |
| parent | fb7ff31315a1c9feefe993264178cb34ce443208 (diff) | |
Cycles: Fix MSVC which desn't like condition to be split by preprocessor
Diffstat (limited to 'intern/cycles/kernel/geom/geom_qbvh_traversal.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_qbvh_traversal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/geom/geom_qbvh_traversal.h b/intern/cycles/kernel/geom/geom_qbvh_traversal.h index 5a8bd2298ce..8d81f475848 100644 --- a/intern/cycles/kernel/geom/geom_qbvh_traversal.h +++ b/intern/cycles/kernel/geom/geom_qbvh_traversal.h @@ -256,11 +256,11 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg, if(nodeAddr < 0) { float4 leaf = kernel_tex_fetch(__bvh_nodes, (-nodeAddr-1)*BVH_QNODE_SIZE+6); - if(UNLIKELY((nodeDist > isect->t) #ifdef __VISIBILITY_FLAG__ - || ((__float_as_uint(leaf.z) & visibility) == 0) + if(UNLIKELY((nodeDist > isect->t) || ((__float_as_uint(leaf.z) & visibility) == 0))) +#else + if(UNLIKELY((nodeDist > isect->t))) #endif - )) { /* Pop. */ nodeAddr = traversalStack[stackPtr].addr; |