diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-22 18:09:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-22 18:09:24 +0300 |
| commit | ed385dd5ce31215abd2c61ecfff41c69035a16da (patch) | |
| tree | 887671219184bd188b0c19e7e12c6b156be610cf /source/blender/render | |
| parent | 0e935e397b945d2a8d76eb1c748e8bc11bca0095 (diff) | |
Fix for mistake in last commit, using wrong flag.
Diffstat (limited to 'source/blender/render')
| -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 2c91c1f0e48..4245fd06fab 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4207,7 +4207,7 @@ static void add_render_object(Render *re, Object *ob, Object *par, DupliObject * /* one render object for the data itself */ if(allow_render) { obr= RE_addRenderObject(re, ob, par, index, 0, ob->lay); - if((dob && !dob->animated) || (ob->flag & OB_RENDER_DUPLI)) { + if((dob && !dob->animated) || (ob->transflag & OB_RENDER_DUPLI)) { obr->flag |= R_INSTANCEABLE; Mat4CpyMat4(obr->obmat, ob->obmat); } @@ -4229,7 +4229,7 @@ static void add_render_object(Render *re, Object *ob, Object *par, DupliObject * psysindex= 1; for(psys=ob->particlesystem.first; psys; psys=psys->next, psysindex++) { obr= RE_addRenderObject(re, ob, par, index, psysindex, ob->lay); - if((dob && !dob->animated) || (ob->flag & OB_RENDER_DUPLI)) { + if((dob && !dob->animated) || (ob->transflag & OB_RENDER_DUPLI)) { obr->flag |= R_INSTANCEABLE; Mat4CpyMat4(obr->obmat, ob->obmat); } |