From 7778f0ff202147121538e8c08a8fa25d1261470e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 29 Dec 2014 21:10:37 +0500 Subject: [PATCH] Cycles: Fix MSVC which desn't like condition to be split by preprocessor --- intern/cycles/kernel/geom/geom_qbvh_traversal.h | 6 +++--- 1 file 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;