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
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-08-26 21:29:40 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-08-26 21:29:40 +0300
commitfef0cd81916f84b0efd9e059ac596c19e2627424 (patch)
treee1f06944652845da95984f6720b1f5d58608fefe /source/blender/blenkernel/intern/particle.c
parent5849651a4650facd6bbf2bc7d13f9bd88dd74120 (diff)
Fix T49151: ParticleSettings' usercount not decremented when removing a psys from an object.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r--source/blender/blenkernel/intern/particle.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 4fb302c71ea..aecaf8537bb 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3172,6 +3172,9 @@ void object_remove_particle_system(Scene *UNUSED(scene), Object *ob)
/* clear particle system */
BLI_remlink(&ob->particlesystem, psys);
+ if (psys->part) {
+ id_us_min(&psys->part->id);
+ }
psys_free(ob, psys);
if (ob->particlesystem.first)