archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for: [#18482] Mixed object and halo visualization for particles needs "Emitter" to be activated.

Browse Source
This commit is contained in:
Janne Karhu
2009-04-06 00:43:59 +00:00
parent ab467e7238
commit fe562f0dd4
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4374,24 +4374,8 @@ void RE_Database_Free(Render *re)
static int allow_render_object(Object *ob, int nolamps, int onlyselected, Object *actob)
{
/* override not showing object when duplis are used with particles */
if(ob->transflag & OB_DUPLIPARTS){
int allow= 0;
if(ob->particlesystem.first) {
ParticleSystem *psys;
ParticleSettings *part;
for(psys=ob->particlesystem.first; psys; psys=psys->next){
part=psys->part;
if(part->draw & PART_DRAW_EMITTER)
allow= 1;
}
}
if(!allow)
return 0;
}
if(ob->transflag & OB_DUPLIPARTS)
; /* let particle system(s) handle showing vs. not showing */
else if((ob->transflag & OB_DUPLI) && !(ob->transflag & OB_DUPLIFRAMES))
return 0;