From 276e0569129979fc115d8a8de51c2698ea55f2f6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 21 Dec 2007 10:57:02 +0000 Subject: [PATCH] Bugfix for strand simplification, without random distribution enabled. Bugfix (hopefully) for missing strands on render bug, probably related to preview render. --- source/blender/blenkernel/intern/particle.c | 4 ++-- source/blender/blenkernel/intern/particle_system.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 32f1795747a..d0bf8b412ef 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -257,8 +257,8 @@ int psys_check_enabled(Object *ob, ParticleSystem *psys) return 0; psmd= psys_get_modifier(ob, psys); - if(G.rendering) { - if(!psys->renderdata || !(psmd->modifier.mode & eModifierMode_Render)) + if(psys->renderdata) { + if(!(psmd->modifier.mode & eModifierMode_Render)) return 0; } else if(!(psmd->modifier.mode & eModifierMode_Realtime)) diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 0294596e84b..db571f01b1e 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1124,7 +1124,7 @@ int psys_threads_init_distribution(ParticleThread *threads, DerivedMesh *finaldm for(i=0;iflag&PART_TRAND){ + if((part->flag&PART_TRAND) || (part->simplify_flag&PART_SIMPLIFY_ENABLE)) { float pos; for(p=0; p