diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-07-20 18:04:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-07-20 18:04:16 +0300 |
| commit | 7484e4529717a61277525bbb6bc9ac7a747e42f1 (patch) | |
| tree | a5cd70a140ed167b9b26cb84e29163546a61d9e3 /source/blender/editors/object/object_add.c | |
| parent | ccc2a7996b836cd255fbb7d7f693f5b958442043 (diff) | |
Fix T78960: 2.83.2 not opening a 2.82a project correctly.
That project cannot be opened correctly ayway, it has recursive
collections intanciating themselves...
But at least now we have a check at startup to detect and 'fix' those
nasty cycles in collections.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index ff49e0a9c5a..aa9d6234d1f 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1395,7 +1395,7 @@ static int collection_instance_add_exec(bContext *C, wmOperator *op) /* Avoid dependency cycles. */ LayerCollection *active_lc = BKE_layer_collection_get_active(view_layer); - while (BKE_collection_find_cycle(active_lc->collection, collection)) { + while (BKE_collection_cycle_find(active_lc->collection, collection)) { active_lc = BKE_layer_collection_activate_parent(view_layer, active_lc); } |