griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Particle: Added sanity in particle system removal function

Browse Source 
Added a NULL check since psys_get_modifier() might also return a NULL pointer.
This commit is contained in:
Sebastián Barschkis
2020-02-06 15:56:02 +01:00
parent 515b4d9a84
commit b088d1e996
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/particle.c
View File

@@ -3638,12 +3638,14 @@ void object_remove_particle_system(Main *bmain, Scene *UNUSED(scene), Object *ob
}
}
/* clear modifier */
/* Clear modifier, skip empty ones. */
psmd = psys_get_modifier(ob, psys);
BLI_remlink(&ob->modifiers, psmd);
modifier_free((ModifierData *)psmd);
if (psmd) {
BLI_remlink(&ob->modifiers, psmd);
modifier_free((ModifierData *)psmd);
}
/* clear particle system */
/* Clear particle system. */
BLI_remlink(&ob->particlesystem, psys);
if (psys->part) {
id_us_min(&psys->part->id);