[Bf-blender-cvs] [06099f391e1] master: Fix T64414: crash deleting collection used for particle group and use count

[Brecht Van Lommel]

Commit: 06099f391e18365da2c81fce52faa903ef44908f
Author: Brecht Van Lommel
Date:   Tue May 21 17:47:04 2019 +0200
Branches: master
https://developer.blender.org/rB06099f391e18365da2c81fce52faa903ef44908f

Fix T64414: crash deleting collection used for particle group and use count

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

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

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

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index c6cc72ba989..13649eaf096 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -387,8 +387,11 @@ void psys_find_group_weights(ParticleSettings *part)
   /* Find object pointers based on index. If the collection is linked from
    * another library linking may not have the object pointers available on
    * file load, so we have to retrieve them later. See T49273. */
-  const ListBase instance_collection_objects = BKE_collection_object_cache_get(
-      part->instance_collection);
+  ListBase instance_collection_objects = {NULL, NULL};
+
+  if (part->instance_collection) {
+    instance_collection_objects = BKE_collection_object_cache_get(part->instance_collection);
+  }
 
   for (ParticleDupliWeight *dw = part->instance_weights.first; dw; dw = dw->next) {
     if (dw->ob == NULL) {