[Bf-blender-cvs] [07c8b829b51] master: Fix (unreported) Outliner's New Collection adding local collection to linked IDs.
Bastien Montagne
noreply at git.blender.org
Tue Mar 12 15:48:50 CET 2019
Commit: 07c8b829b51f1d59a214b229251902792735b92a
Author: Bastien Montagne
Date: Tue Mar 12 15:15:58 2019 +0100
Branches: master
https://developer.blender.org/rB07c8b829b51f1d59a214b229251902792735b92a
Fix (unreported) Outliner's New Collection adding local collection to linked IDs.
Similar issue to the one about Duplicate operation...
===================================================================
M source/blender/editors/space_outliner/outliner_collections.c
===================================================================
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,
More information about the Bf-blender-cvs
mailing list