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
path: root/source
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2018-12-07 11:49:28 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2018-12-07 12:54:44 +0300
commit41e4059f3c41234016dfabf6b3ae9e40c735483e (patch)
tree5124e0b5ee6d91a33b245331b7c2ef0c8aa1691b /source
parent999b4667846f84527515f5beb0f93538622c5a7e (diff)
Fix T58046: Crash when changing Particle type, when Hair has dynamics
thx @sergey for checking
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/particle.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 8a1134e0c80..f86fe271a9f 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -469,6 +469,7 @@ void free_hair(Object *object, ParticleSystem *psys, int dynamics)
if (psys->clmd) {
if (dynamics) {
modifier_free((ModifierData *)psys->clmd);
+ psys->clmd = NULL;
PTCacheID pid;
BKE_ptcache_id_from_particles(&pid, object, psys);
BKE_ptcache_id_clear(&pid, PTCACHE_CLEAR_ALL, 0);