[Bf-blender-cvs] [b088d1e9969] blender-v2.82-release: Particle: Added sanity in particle system removal function

[Sebastián Barschkis]

Commit: b088d1e9969d440ffb7cc9614cef0ca81da46433
Author: Sebastián Barschkis
Date:   Thu Feb 6 15:56:02 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBb088d1e9969d440ffb7cc9614cef0ca81da46433

Particle: Added sanity in particle system removal function

Added a NULL check since psys_get_modifier() might also return a NULL pointer.

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

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

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 97fcef4fd27..eafd530b0d8 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -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);