[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50297] trunk/blender/intern/cycles/ blender/blender_object.cpp: Cycles: Start the particle index for object instances at 1 instead 0.

[Lukas Toenne]

Revision: 50297
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50297
Author:   lukastoenne
Date:     2012-08-31 19:39:04 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
Cycles: Start the particle index for object instances at 1 instead 0. The first particle in the device texture is a dummy for non-instance objects using the particle info node.

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

Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp	2012-08-31 19:39:03 UTC (rev 50296)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2012-08-31 19:39:04 UTC (rev 50297)
@@ -296,7 +296,7 @@
 	/* object loop */
 	BL::Scene::objects_iterator b_ob;
 	BL::Scene b_sce = b_scene;
-	int particle_offset = 0;
+	int particle_offset = 1;	/* first particle is dummy for regular, non-instanced objects */
 
 	for(; b_sce; b_sce = b_sce.background_set()) {
 		for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end(); ++b_ob) {