archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix (unreported) Outliner's New Collection adding local collection to linked IDs.

Browse Source 
Similar issue to the one about Duplicate operation...
This commit is contained in:
Bastien Montagne
2019-03-12 15:15:58 +01:00
parent d5576d3b0f
commit 07c8b829b5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,10 +195,15 @@ static int collection_new_exec(bContext *C, wmOperator *op)
} }
} }
if (data.collection == NULL) { if (data.collection == NULL || ID_IS_LINKED(data.collection)) {
data.collection = BKE_collection_master(scene); data.collection = BKE_collection_master(scene);
} }
if (ID_IS_LINKED(scene)) {
BKE_report(op->reports, RPT_ERROR, "Can't add a new collection to linked scene/collection");
return OPERATOR_CANCELLED;
}
BKE_collection_add( BKE_collection_add(
bmain, bmain,
data.collection, data.collection,