Fix #20400: hair particles do not render when in "particle mode"

if children present.

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 31336b32bf53ffaedb2647a3a8c5f3d4538d6d8b..b88df677c9b6ef2cc14078eb9c443b7516a03f4b 100644 (file)
--- 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);