[Bf-blender-cvs] [7778f0f] master: Cycles: Fix MSVC which desn't like condition to be split by preprocessor

Sergey Sharybin noreply at git.blender.org
Mon Dec 29 17:12:24 CET 2014


Commit: 7778f0ff202147121538e8c08a8fa25d1261470e
Author: Sergey Sharybin
Date:   Mon Dec 29 21:10:37 2014 +0500
Branches: master
https://developer.blender.org/rB7778f0ff202147121538e8c08a8fa25d1261470e

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

===================================================================

M	intern/cycles/kernel/geom/geom_qbvh_traversal.h

===================================================================

diff --git a/intern/cycles/kernel/geom/geom_qbvh_traversal.h b/intern/cycles/kernel/geom/geom_qbvh_traversal.h
index 5a8bd22..8d81f47 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;




More information about the Bf-blender-cvs mailing list