Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2010-09-02 11:24:38 +0400
committerJanne Karhu <jhkarh@gmail.com>2010-09-02 11:24:38 +0400
commit18954a711fc920da3933e71d7705f07337fd13eb (patch)
tree6f93bc1e0f86656d70e7e2ccaac51174b688f6c2 /source/blender
parentb2ae9d825c96ed73d2396b8da6e0c019a6384ff7 (diff)
Fix for [#22329] Particles won't render when display mode is different
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index b43cf72b94b..e2dbae92d5c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -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;