From 07c8b829b51f1d59a214b229251902792735b92a Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 12 Mar 2019 15:15:58 +0100 Subject: Fix (unreported) Outliner's New Collection adding local collection to linked IDs. Similar issue to the one about Duplicate operation... --- source/blender/editors/space_outliner/outliner_collections.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index f7084399268..04104aa0e4c 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -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); } + 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( bmain, data.collection, -- cgit v1.2.3