Code tweak removing comment, the fix here is indeed correct.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 31 Jul 2012 15:05:11 +0000 (15:05 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 31 Jul 2012 15:05:11 +0000 (15:05 +0000)
intern/cycles/bvh/bvh.cpp

index bdcd3b6ba19fc0c81a42ef11a4b239bd7c21c66d..4d3588452ebb372e05c78cd5bf15cf331c40c55a 100644 (file)
@@ -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];