blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Philipp Oeser 2020-05-15 16:32:50 +02:00
parent b67f649077 a269761ec1
commit d6e0b55b1c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/object/object_collection.c
View File

@ -483,17 +483,13 @@ static int collection_link_exec(bContext *C, wmOperator *op)
/* Currently this should not be allowed (might be supported in the future though...). */
if (ID_IS_OVERRIDE_LIBRARY(&collection->id)) {
BKE_report(op->reports,
RPT_ERROR,
"Could not add the collection because it is overridden.");
BKE_report(op->reports, RPT_ERROR, "Could not add the collection because it is overridden.");
return OPERATOR_CANCELLED;
}
/* Linked collections are already checked for by using RNA_collection_local_itemf
* but operator can be called without invoke */
if (ID_IS_LINKED(&collection->id)) {
BKE_report(op->reports,
RPT_ERROR,
"Could not add the collection because it is linked.");
BKE_report(op->reports, RPT_ERROR, "Could not add the collection because it is linked.");
return OPERATOR_CANCELLED;
}