Revision: 30116
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30116
Author: blendix
Date: 2010-07-08 17:07:35 +0200 (Thu, 08 Jul 2010)
Log Message:
-----------
Fix: object_duplilist should be passed the original scene rather than
the set scene, otherwise can have wrong current frame and render settings,
in particular this give issues with particle object instancing.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c
2010-07-08 14:30:43 UTC (rev 30115)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c
2010-07-08 15:07:35 UTC (rev 30116)
@@ -4780,7 +4780,7 @@
/* in the prev/next pass for making speed vectors, avoid
creating
* objects that are not on a renderlayer with a vector pass, can
* save a lot of time in complex scenes */
- vectorlay= get_vector_renderlayers(sce);
+ vectorlay= get_vector_renderlayers(re->scene);
lay= (timeoffset)? renderlay & vectorlay: renderlay;
/* if the object has been restricted from rendering in the
outliner, ignore it */
@@ -4807,7 +4807,7 @@
/* create list of duplis generated by this
object, particle
* system need to have render settings set for
dupli particles */
dupli_render_particle_set(re, ob, timeoffset,
0, 1);
- lb= object_duplilist(sce, ob);
+ lb= object_duplilist(re->scene, ob);
dupli_render_particle_set(re, ob, timeoffset,
0, 0);
for(dob= lb->first; dob; dob= dob->next) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
