diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-14 18:11:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-02-14 18:11:39 +0300 |
| commit | cd3c70cca25c55f8ef62f3b052ea7ef3274b6a96 (patch) | |
| tree | b2aa90e7d707f3c01208bfc0f6fe8ccb1d3b7522 /source/blender/blenkernel/intern/particle.c | |
| parent | 32aea49b6dfbb1f80f62329d5ff16fc37551c0fd (diff) | |
Fix #20400: hair particles do not render when in "particle mode"
if children present.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 31336b32bf5..b88df677c9b 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -60,6 +60,7 @@ #include "BLI_threads.h" #include "BKE_anim.h" +#include "BKE_animsys.h" #include "BKE_boids.h" #include "BKE_cloth.h" @@ -254,7 +255,7 @@ void psys_enable_all(Object *ob) } int psys_in_edit_mode(Scene *scene, ParticleSystem *psys) { - return (scene->basact && (scene->basact->object->mode & OB_MODE_PARTICLE_EDIT) && psys==psys_get_current((scene->basact)->object) && (psys->edit || psys->pointcache->edit)); + return (scene->basact && (scene->basact->object->mode & OB_MODE_PARTICLE_EDIT) && psys==psys_get_current((scene->basact)->object) && (psys->edit || psys->pointcache->edit) && !psys->renderdata); } static void psys_create_frand(ParticleSystem *psys) { @@ -370,6 +371,7 @@ int psys_uses_gravity(ParticleSimulationData *sim) /************************************************/ void psys_free_settings(ParticleSettings *part) { + BKE_free_animdata(&part->id); free_partdeflect(part->pd); free_partdeflect(part->pd2); |