[Bf-blender-cvs] [979a4a6] blender-v2.78-release: Cycles: Cleanup: line wrapping

Sergey Sharybin noreply at git.blender.org
Wed Sep 14 10:38:38 CEST 2016


Commit: 979a4a613cb5ae4662eed9afb2713d6b9f178fbb
Author: Sergey Sharybin
Date:   Thu Sep 8 14:26:10 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rB979a4a613cb5ae4662eed9afb2713d6b9f178fbb

Cycles: Cleanup: line wrapping

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

M	intern/cycles/bvh/bvh.cpp

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

diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index 1bb3e95..bf301eb 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -475,10 +475,20 @@ void RegularBVH::pack_aligned_node(int idx,
 	int4 data[BVH_NODE_SIZE] =
 	{
 		make_int4(visibility0 & ~PATH_RAY_NODE_UNALIGNED,
-		          visibility1 & ~PATH_RAY_NODE_UNALIGNED, c0, c1),
-		make_int4(__float_as_int(b0.min.x), __float_as_int(b1.min.x), __float_as_int(b0.max.x), __float_as_int(b1.max.x)),
-		make_int4(__float_as_int(b0.min.y), __float_as_int(b1.min.y), __float_as_int(b0.max.y), __float_as_int(b1.max.y)),
-		make_int4(__float_as_int(b0.min.z), __float_as_int(b1.min.z), __float_as_int(b0.max.z), __float_as_int(b1.max.z)),
+		          visibility1 & ~PATH_RAY_NODE_UNALIGNED,
+		          c0, c1),
+		make_int4(__float_as_int(b0.min.x),
+		          __float_as_int(b1.min.x),
+		          __float_as_int(b0.max.x),
+		          __float_as_int(b1.max.x)),
+		make_int4(__float_as_int(b0.min.y),
+		          __float_as_int(b1.min.y),
+		          __float_as_int(b0.max.y),
+		          __float_as_int(b1.max.y)),
+		make_int4(__float_as_int(b0.min.z),
+		          __float_as_int(b1.min.z),
+		          __float_as_int(b0.max.z),
+		          __float_as_int(b1.max.z)),
 	};
 
 	memcpy(&pack.nodes[idx], data, sizeof(int4)*BVH_NODE_SIZE);




More information about the Bf-blender-cvs mailing list