diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-24 08:35:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-24 08:35:21 +0400 |
commit | 671cb93f1b38b28fbc349d6a6646f8bea83ebccd (patch) | |
tree | 8921ee06a67273f2a3d6b38cf2dc459aca944273 /source/blender/blenlib/intern/pbvh.c | |
parent | 94b8a81c17e835f0c5185e5396b06ddcb2f684ce (diff) | |
parent | 1e00590f1c2f8d98ed52f8e12d70723165edc9d3 (diff) |
svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenlib/intern/pbvh.c')
-rw-r--r-- | source/blender/blenlib/intern/pbvh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c index e9a0ddd4825..301fa34fe7e 100644 --- a/source/blender/blenlib/intern/pbvh.c +++ b/source/blender/blenlib/intern/pbvh.c @@ -1437,7 +1437,7 @@ int BLI_pbvh_node_planes_contain_AABB(PBVHNode *node, void *data) { float (*planes)[4] = data; int i, axis; - float vmin[3], vmax[3], bb_min[3], bb_max[3]; + float vmin[3] /*, vmax[3]*/, bb_min[3], bb_max[3]; BLI_pbvh_node_get_BB(node, bb_min, bb_max); @@ -1445,11 +1445,11 @@ int BLI_pbvh_node_planes_contain_AABB(PBVHNode *node, void *data) for(axis = 0; axis < 3; ++axis) { if(planes[i][axis] > 0) { vmin[axis] = bb_min[axis]; - vmax[axis] = bb_max[axis]; + /*vmax[axis] = bb_max[axis];*/ /*UNUSED*/ } else { vmin[axis] = bb_max[axis]; - vmax[axis] = bb_min[axis]; + /*vmax[axis] = bb_min[axis];*/ /*UNUSED*/ } } |