diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-18 02:04:10 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-18 02:06:15 +0400 |
commit | 80d3eb6964941a314cd58135b80c78bd0cabe595 (patch) | |
tree | 0db2026235b4e6a67da25ce956d440601bda92bb | |
parent | 8620008ccdda5ca7d7b83cb6b1a24e62f881ee84 (diff) |
Fix a BI bug: when an object had dupliobjects children, it was never rendered at all,
even if having particle systems.
This was not matching behavior of Cycles and 3DView!
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 36fd1b2d6af..5c44f1cd0c1 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4791,13 +4791,12 @@ static int allow_render_object(Render *re, Object *ob, int nolamps, int onlysele { if (is_object_hidden(re, ob)) return 0; - - /* override not showing object when duplis are used with particles */ - if (ob->transflag & OB_DUPLIPARTS) { - /* pass */ /* let particle system(s) handle showing vs. not showing */ - } - else if ((ob->transflag & OB_DUPLI) && !(ob->transflag & OB_DUPLIFRAMES)) { - return 0; + + /* Only handle dupli-hiding here if there is no particle systems. Else, let those handle show/noshow. */ + if (!ob->particlesystem.first) { + if ((ob->transflag & OB_DUPLI) && !(ob->transflag & OB_DUPLIFRAMES)) { + return 0; + } } /* don't add non-basic meta objects, ends up having renderobjects with no geometry */ |