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:
authorJanne Karhu <jhkarh@gmail.com>2011-01-12 13:01:33 +0300
committerJanne Karhu <jhkarh@gmail.com>2011-01-12 13:01:33 +0300
commit4e15c169c69d3f7bb0d05ab4fc9d4762e2427e9a (patch)
treeb11d5003d41f9b24e3f3a3e73b9076d20e566a5b /source
parent4043830cf878de493ddd7d77190a0bc06cce6e3d (diff)
Fix for [#25572] crash when changing vertex group density in particle mode
* Hair was freed & redone on changes, but particle mode data wasn't updated.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 27adeaa2430..06056e0ecc9 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4100,6 +4100,12 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
free_hair(ob, psys, 0);
+ if(psys->edit && psys->free_edit) {
+ psys->free_edit(psys->edit);
+ psys->edit = NULL;
+ psys->free_edit = NULL;
+ }
+
/* first step is negative so particles get killed and reset */
psys->cfra= 1.0f;