[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19554] trunk/blender/source/blender/ render/intern/source/convertblender.c: Fix for: [#18482] Mixed object and halo visualization for particles needs "Emitter" to be activated.

[Janne Karhu]

Revision: 19554
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19554
Author:   jhk
Date:     2009-04-06 02:43:59 +0200 (Mon, 06 Apr 2009)

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

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c  
2009-04-06 00:22:58 UTC (rev 19553)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c  
2009-04-06 00:43:59 UTC (rev 19554)
@@ -4374,24 +4374,8 @@
 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;
        


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs