diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-07-31 19:05:11 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-07-31 19:05:11 +0400 |
| commit | fe401712a9fd1c1645ca59dcbe186f64488b5b1b (patch) | |
| tree | 0747c8908e8172534e7c8818e89340b30e504203 /intern | |
| parent | aac3f0eaebd155eca29b62cad322687bfd30dc1f (diff) | |
Code tweak removing comment, the fix here is indeed correct.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/bvh/bvh.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index bdcd3b6ba19..4d3588452eb 100644 --- a/intern/cycles/bvh/bvh.cpp +++ b/intern/cycles/bvh/bvh.cpp @@ -378,19 +378,10 @@ void BVH::pack_instances(size_t nodes_size) int mesh_tri_offset = mesh->tri_offset; /* fill in node indexes for instances */ - if( - /* XXX, brecht. check this is needed!. it could be a bug elsewhere - * /mango/pro/scenes/04_2e/04_2e.blend r2158. on Ian's system 192.168.3.27 - campbell */ - (bvh->pack.is_leaf.size() != 0) && - - /* previously only checked this */ - bvh->pack.is_leaf[0]) - { + if((bvh->pack.is_leaf.size() != 0) && bvh->pack.is_leaf[0]) pack.object_node[object_offset++] = -noffset-1; - } - else { + else pack.object_node[object_offset++] = noffset; - } mesh_map[mesh] = pack.object_node[object_offset-1]; |