diff options
author | Julian Eisel <julian@blender.org> | 2020-06-16 12:31:58 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-06-16 12:31:58 +0300 |
commit | 87df15190210eb84ef52e5dccc2932918f912da5 (patch) | |
tree | 94c4d71ed7c20b2fd7ebac4ce50a736ed165b1d0 /source/blender/editors/object/object_collection.c | |
parent | d73920831de0a87faa0c91261dc2ff8d07913318 (diff) | |
parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) |
Merge branch 'asset-uuid' into asset-engine
Diffstat (limited to 'source/blender/editors/object/object_collection.c')
-rw-r--r-- | source/blender/editors/object/object_collection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c index 7a83d582299..24f6d8c79f9 100644 --- a/source/blender/editors/object/object_collection.c +++ b/source/blender/editors/object/object_collection.c @@ -483,13 +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; } |