diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-10-21 17:30:18 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-10-21 17:30:18 +0400 |
| commit | 9e830c0c9c6ad1ea2e47d19ec5f0e2500640dab1 (patch) | |
| tree | 940195a591ddfdde9b86d697ef01af912d04df9e /source/blender | |
| parent | 203ff71b9eff4a2cf601994ae0ec86ac165bedfc (diff) | |
Bugfix #27504
Render error.
Particle systems that duplicate group instances were setting the wrong
layer to the instanced objects, the correct layer is the particle system
itself - as being shown in the viewport correctly already.
Old report from May 2011 :)
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index ea3673c28f8..f1e8d532cda 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4935,7 +4935,8 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp * a dupligroup that has already been created before */ if (dob->type != OB_DUPLIGROUP || (obr=find_dupligroup_dupli(re, obd, 0))) { mult_m4_m4m4(mat, re->viewmat, dob->mat); - obi= RE_addRenderInstance(re, NULL, obd, ob, dob->index, 0, mat, obd->lay); + /* ob = particle system, use that layer */ + obi= RE_addRenderInstance(re, NULL, obd, ob, dob->index, 0, mat, ob->lay); /* fill in instance variables for texturing */ set_dupli_tex_mat(re, obi, dob); |