diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-27 15:34:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-27 15:34:59 +0300 |
| commit | da3c35db479f2aac794d9706712dcd8b6906d954 (patch) | |
| tree | 5979979430b909a37ca9b21f27cff7a443d69192 /source/blender/render/intern | |
| parent | 2a743951fcd8af803a3d9bcfec0ffae7769e0750 (diff) | |
Particles
=========
- Bugfix: synchronize modifier enable with particle enable flag to
prevent crash.
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index d97d8293c94..dd593d9edcc 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1755,11 +1755,13 @@ static int render_new_particle_system(Render *re, Object *ob, ParticleSystem *ps return 1; } + psmd= psys_get_modifier(ob,psys); + if(!(psmd->modifier.mode & eModifierMode_Render)) + return 0; + psys->flag|=PSYS_DRAWING; BLI_srandom(psys->seed); - - psmd= psys_get_modifier(ob,psys); ma= give_render_material(re, ob, part->omat); |