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!
This commit is contained in:
parent
8620008ccd
commit
80d3eb6964
Notes:
blender-bot
2023-02-14 11:18:04 +01:00
Referenced by issue #41240, Home key doesn't show everything on F-Curves Referenced by issue #38335, Raycast and replaceMesh
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue