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

Fix T62488: Can delete collection from indirect linked library. 

Same issue as with previous commits for other Collection Outlier's
operations, checks are always different though...
This commit is contained in:
Bastien Montagne 2019-03-12 15:37:09 +01:00
parent 07c8b829b5
commit 9778b0a5bc
Notes: blender-bot 2023-04-04 07:45:26 +02:00 
Referenced by issue #62488, Can delete collection from indirect linked library
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/editors/space_outliner/outliner_collections.c
View File

@ -290,7 +290,39 @@ static int collection_delete_exec(bContext *C, wmOperator *op)
/* Test in case collection got deleted as part of another one. */
if (BLI_findindex(&bmain->collections, collection) != -1) {
BKE_collection_delete(bmain, collection, hierarchy);
/* We cannot allow to delete collections that are indirectly linked, or that are used by (linked to...)
* other linked scene/collection. */
bool skip = false;
if (ID_IS_LINKED(collection)) {
if (collection->id.tag & LIB_TAG_INDIRECT) {
skip = true;
}
else {
for (CollectionParent *cparent = collection->parents.first; cparent; cparent = cparent->next) {
Collection *parent = cparent->collection;
if (ID_IS_LINKED(parent)) {
skip = true;
break;
}
else if (parent->flag & COLLECTION_IS_MASTER) {
Scene *parent_scene = BKE_collection_master_scene_search(bmain, parent);
if (ID_IS_LINKED(parent_scene)) {
skip = true;
break;
}
}
}
}
}
if (!skip) {
BKE_collection_delete(bmain, collection, hierarchy);
}
else {
BKE_reportf(op->reports, RPT_WARNING,
"Cannot delete linked collection '%s', it is used by other linked scenes/collections",
collection->id.name + 2);
}
}
}