diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:05:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:05:32 +0400 |
| commit | e59ab6486f9e7285815671044b785c28365d5165 (patch) | |
| tree | 4a9406c8181a817a8b96243ae167acc740ed20f7 /source/blender/blenlib/intern/pbvh.c | |
| parent | 35ab6cabbf62187290e417dba6d8b18cd4fe18de (diff) | |
| parent | b1019a56b54294fc91293c5c43ef46d54950ae84 (diff) | |
svn merge -r41751:41779 ^/trunk/blender
Diffstat (limited to 'source/blender/blenlib/intern/pbvh.c')
| -rw-r--r-- | source/blender/blenlib/intern/pbvh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c index 16cc3c15bfd..ecf8fc706b9 100644 --- a/source/blender/blenlib/intern/pbvh.c +++ b/source/blender/blenlib/intern/pbvh.c @@ -507,13 +507,13 @@ static void build_sub(PBVH *bvh, int node_index, BB *cb, BBC *prim_bbc, bvh->nodes[node_index].orig_vb= bvh->nodes[node_index].vb; end = partition_indices(bvh->prim_indices, offset, offset + count - 1, - axis, - (cb->bmax[axis] + cb->bmin[axis]) * 0.5f, - prim_bbc); + axis, + (cb->bmax[axis] + cb->bmin[axis]) * 0.5f, + prim_bbc); check_partitioning(bvh->prim_indices, offset, offset + count - 1, - axis, - (cb->bmax[axis] + cb->bmin[axis]) * 0.5f, - prim_bbc, end); + axis, + (cb->bmax[axis] + cb->bmin[axis]) * 0.5f, + prim_bbc, end); build_sub(bvh, bvh->nodes[node_index].children_offset, NULL, prim_bbc, offset, end - offset); |