Fix T64414: crash deleting collection used for particle group and use count
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 21 May 2019 15:47:04 +0000 (17:47 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 21 May 2019 15:47:04 +0000 (17:47 +0200)
source/blender/blenkernel/intern/particle.c

index c6cc72b..13649ea 100644 (file)
@@ -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) {