Fix for: [#18482] Mixed object and halo visualization for particles needs "Emitter...
authorJanne Karhu <jhkarh@gmail.com>
Mon, 6 Apr 2009 00:43:59 +0000 (00:43 +0000)
committerJanne Karhu <jhkarh@gmail.com>
Mon, 6 Apr 2009 00:43:59 +0000 (00:43 +0000)
source/blender/render/intern/source/convertblender.c

index 9e474c1961910fd1e98af3d980eefac1f2b9669c..06ba8f16a3b3f9caccedd99ae0841aca09d7b393 100644 (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;