diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-05-15 17:32:50 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-05-15 17:32:50 +0300 |
commit | d6e0b55b1c695473313f6c2a97547c0fc14dda15 (patch) | |
tree | 7407a6ecaddea656f20b5e9caaebc520880edc3a /source/blender/editors/object/object_collection.c | |
parent | b67f6490771daab07a8af18eb207a5f3b5045202 (diff) | |
parent | a269761ec1bce0f551cf7fc9c373f3c735df412c (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/object/object_collection.c')
-rw-r--r-- | source/blender/editors/object/object_collection.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c index 74ba94fbf4c..7a83d582299 100644 --- a/source/blender/editors/object/object_collection.c +++ b/source/blender/editors/object/object_collection.c @@ -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; } |