griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix a BI bug: when an object had dupliobjects children, it was never rendered at all,

Browse Source 
even if having particle systems.

This was not matching behavior of Cycles and 3DView!
This commit is contained in:
Bastien Montagne
2014-07-18 00:04:10 +02:00
parent 8620008ccd
commit 80d3eb6964
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/render/intern/source/convertblender.c
View File

@@ -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 */