diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-08 19:07:35 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-08 19:07:35 +0400 |
| commit | 258955394b90b014ad20dabd15f67d2d685d99fd (patch) | |
| tree | cf76c23a03e09843a594bc6c37cd4596ca59dcfb /source | |
| parent | 6fcacf077df261183bfe1976909cb1d636a913ed (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index c3034768a4e..4436bdb9261 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4780,7 +4780,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp /* 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 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp /* 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) { |