From 7484e4529717a61277525bbb6bc9ac7a747e42f1 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 20 Jul 2020 17:04:16 +0200 Subject: 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. --- source/blender/blenkernel/BKE_collection.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_collection.h') diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h index db2fe651c91..25bc2006ee3 100644 --- a/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -153,7 +153,8 @@ bool BKE_collection_move(struct Main *bmain, bool relative_after, struct Collection *collection); -bool BKE_collection_find_cycle(struct Collection *new_ancestor, struct Collection *collection); +bool BKE_collection_cycle_find(struct Collection *new_ancestor, struct Collection *collection); +bool BKE_collection_cycles_fix(struct Main *bmain, struct Collection *collection); bool BKE_collection_has_collection(struct Collection *parent, struct Collection *collection); -- cgit v1.2.3