Fix for [#22329] Particles won't render when display mode is different
authorJanne Karhu <jhkarh@gmail.com>
Thu, 2 Sep 2010 07:24:38 +0000 (07:24 +0000)
committerJanne Karhu <jhkarh@gmail.com>
Thu, 2 Sep 2010 07:24:38 +0000 (07:24 +0000)
source/blender/blenkernel/intern/object.c

index b43cf72b94b7a0cf2cb197a13051bcadb7703fac..e2dbae92d5c5624de9cc171903c3746105209f0b 100644 (file)
@@ -2553,7 +2553,7 @@ void object_handle_update(Scene *scene, Object *ob)
                                while(psys) {
                                        if(psys_check_enabled(ob, psys)) {
                                                /* check use of dupli objects here */
-                                               if(psys->part && psys->part->draw_as == PART_DRAW_REND &&
+                                               if(psys->part && (psys->part->draw_as == PART_DRAW_REND || G.rendering) &&
                                                        ((psys->part->ren_as == PART_DRAW_OB && psys->part->dup_ob)
                                                        || (psys->part->ren_as == PART_DRAW_GR && psys->part->dup_group)))
                                                        ob->transflag |= OB_DUPLIPARTS;