[Bf-blender-cvs] [ec54a08] master: Revert "Cycles: Tweak empty boundbox children"
Sergey Sharybin
noreply at git.blender.org
Thu Sep 15 09:40:29 CEST 2016
Commit: ec54a08d307b1b1d8af164719ea447ec8f7a40f7
Author: Sergey Sharybin
Date: Thu Sep 15 09:39:33 2016 +0200
Branches: master
https://developer.blender.org/rBec54a08d307b1b1d8af164719ea447ec8f7a40f7
Revert "Cycles: Tweak empty boundbox children"
This reverts commit ecbfa31caaadb03c53c0fe1459718b99613c8804.
Original commit broke logic in nodes re-fitting. That area can
access non-existing children momentarely. Not sure what would
be best solution here, for now simply reverting the change/
===================================================================
M intern/cycles/bvh/bvh.cpp
===================================================================
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index bb326d4..39b2a0c 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -885,7 +885,7 @@ void QBVH::pack_aligned_node(int idx,
data[5][i] = FLT_MAX;
data[6][i] = -FLT_MAX;
- data[7][i] = __int_as_float(INT_MAX);
+ data[7][i] = __int_as_float(0);
}
memcpy(&pack.nodes[idx], data, sizeof(float4)*BVH_QNODE_SIZE);
@@ -968,7 +968,7 @@ void QBVH::pack_unaligned_node(int idx,
data[11][i] = -FLT_MAX;
data[12][i] = -FLT_MAX;
- data[13][i] = __int_as_float(INT_MAX);
+ data[13][i] = __int_as_float(0);
}
memcpy(&pack.nodes[idx], data, sizeof(float4)*BVH_UNALIGNED_QNODE_SIZE);
More information about the Bf-blender-cvs
mailing list