diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-08 15:26:10 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-08 15:26:10 +0300 |
commit | 3598a3d1d532bb74b6747d14447bb68fd7d6f4cf (patch) | |
tree | 8cb9069cd067149c19e519b56208d2811a8e46ca /intern | |
parent | 45f833c21dcfad4d1d7045987bb8b69d6aab05be (diff) |
Cycles: Cleanup: line wrapping
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/bvh/bvh.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index 1bb3e95c810..bf301eb4ae6 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); |