[Bf-blender-cvs] [fef0cd8] master: Fix T49151: ParticleSettings' usercount not decremented when removing a psys from an object.
Bastien Montagne
noreply at git.blender.org
Fri Aug 26 20:30:36 CEST 2016
Commit: fef0cd81916f84b0efd9e059ac596c19e2627424
Author: Bastien Montagne
Date: Fri Aug 26 20:29:40 2016 +0200
Branches: master
https://developer.blender.org/rBfef0cd81916f84b0efd9e059ac596c19e2627424
Fix T49151: ParticleSettings' usercount not decremented when removing a psys from an object.
===================================================================
M source/blender/blenkernel/intern/particle.c
===================================================================
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 4fb302c..aecaf85 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)
More information about the Bf-blender-cvs
mailing list