kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Fix MSVC which desn't like condition to be split by preprocessor

Browse Source
This commit is contained in:
Sergey Sharybin 2014-12-29 21:10:37 +05:00
parent fb7ff31315
commit 7778f0ff20
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/geom/geom_qbvh_traversal.h
View File

@ -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;