Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2022-05-19 17:54:10 +0300
committerBastien Montagne <bastien@blender.org>2022-05-19 17:54:10 +0300
commit436a7ee65176090ee44de6dbf38d4eb512ffaf9e (patch)
tree9a92fa46080e44dee8447abd54aa2dd9d057f9b3 /source/blender/editors/object/object_edit.c
parenteb13072399559de0a5b38b874b3a00850e1bf483 (diff)
parent2d5b91d6a0f7470dd475721ea038c061513090d7 (diff)
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
-rw-r--r--source/blender/editors/object/object_edit.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index c9626e674f2..adac1479c7e 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1835,6 +1835,11 @@ static int move_to_collection_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
+ if (ID_IS_OVERRIDE_LIBRARY(collection)) {
+ BKE_report(op->reports, RPT_ERROR, "Cannot add objects to a library override collection");
+ return OPERATOR_CANCELLED;
+ }
+
ListBase objects = selected_objects_get(C);
if (is_new) {