Commit: 4225e18effce12f26136b451e2ef361a0582a9b8
Author: Sergey Sharybin
Date: Tue Jun 14 23:35:14 2016 +0200
Branches: cycles_bvh
https://developer.blender.org/rB4225e18effce12f26136b451e2ef361a0582a9b8
Cycles: Some quick fixes to previous commit
===================================================================
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 0de6452..7745d11 100644
--- a/intern/cycles/kernel/geom/geom_qbvh_traversal.h
+++ b/intern/cycles/kernel/geom/geom_qbvh_traversal.h
@@ -28,7 +28,7 @@
*
*/
-#if BVH_FEATURE(BVH_HAIR) || 1
+#if BVH_FEATURE(BVH_HAIR)
# define NODE_INTERSECT qbvh_curve_node_intersect
# define NODE_INTERSECT_ROBUST qbvh_curve_node_intersect_robust
#else
@@ -179,10 +179,13 @@ ccl_device bool
BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
* gives a speedup (will be different
cache pattern but will
* avoid extra check here),
*/
+#if BVH_FEATURE(BVH_HAIR)
if(__float_as_uint(inodes.x) &
PATH_RAY_NODE_UNALIGNED) {
cnodes =
kernel_tex_fetch(__bvh_nodes, nodeAddr+13);
}
- else {
+ else
+#endif
+ {
cnodes =
kernel_tex_fetch(__bvh_nodes, nodeAddr+7);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
