[Bf-blender-cvs] [3323693ea0b] greasepencil-object: Fix T58046: Crash when changing Particle type, when Hair has dynamics

[Philipp Oeser]

Commit: 3323693ea0b38b5adb53966fabe00ffd2a0ce23e
Author: Philipp Oeser
Date:   Fri Dec 7 09:49:28 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB3323693ea0b38b5adb53966fabe00ffd2a0ce23e

Fix T58046: Crash when changing Particle type, when Hair has dynamics

thx @sergey for checking

===================================================================

M	source/blender/blenkernel/intern/particle.c

===================================================================

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);