blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

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

This commit is contained in:
Brecht Van Lommel 2019-05-21 17:47:04 +02:00
parent 0977937286
commit 06099f391e
Notes: blender-bot 2023-02-14 03:34:17 +01:00 
Referenced by issue #64414, Deleting Collection crashes Blender when hair system renders with collection & 'Use Count'
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/particle.c
View 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) {