[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49418] trunk/blender/intern/cycles/bvh/ bvh.cpp: Code tweak removing comment, the fix here is indeed correct.

[Brecht Van Lommel]

Revision: 49418
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49418
Author:   blendix
Date:     2012-07-31 15:05:11 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Code tweak removing comment, the fix here is indeed correct.

Modified Paths:
--------------
    trunk/blender/intern/cycles/bvh/bvh.cpp

Modified: trunk/blender/intern/cycles/bvh/bvh.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh.cpp	2012-07-31 15:05:09 UTC (rev 49417)
+++ trunk/blender/intern/cycles/bvh/bvh.cpp	2012-07-31 15:05:11 UTC (rev 49418)
@@ -378,19 +378,10 @@
 		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];