forked from bartvdbraak/blender
Cycles: Fix MSVC which desn't like condition to be split by preprocessor
This commit is contained in:
parent
fb7ff31315
commit
7778f0ff20
@ -256,11 +256,11 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
|
|||||||
if(nodeAddr < 0) {
|
if(nodeAddr < 0) {
|
||||||
float4 leaf = kernel_tex_fetch(__bvh_nodes, (-nodeAddr-1)*BVH_QNODE_SIZE+6);
|
float4 leaf = kernel_tex_fetch(__bvh_nodes, (-nodeAddr-1)*BVH_QNODE_SIZE+6);
|
||||||
|
|
||||||
if(UNLIKELY((nodeDist > isect->t)
|
|
||||||
#ifdef __VISIBILITY_FLAG__
|
#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
|
#endif
|
||||||
))
|
|
||||||
{
|
{
|
||||||
/* Pop. */
|
/* Pop. */
|
||||||
nodeAddr = traversalStack[stackPtr].addr;
|
nodeAddr = traversalStack[stackPtr].addr;
|
||||||
|
Loading…
Reference in New Issue
Block a user