Merge branch 'blender-v4.0-release'

2023-10-17 16:11:30 +05:30
parent 31ec00895f 8867cfc563
commit fd192188cd
1 changed files with 9 additions and 0 deletions
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -393,6 +393,15 @@ static void unlink_collection_fn(bContext *C,
    return;
  }

+  if (tsep && (ID_IS_LINKED(tsep->id) || ID_IS_OVERRIDE_LIBRARY(tsep->id))) {
+    BKE_reportf(reports,
+                RPT_WARNING,
+                "Cannot unlink collection '%s' parented to another linked collection '%s'",
+                collection->id.name + 2,
+                tsep->id->name + 2);
+    return;
+  }
+
  if (tsep) {
    if (GS(tsep->id->name) == ID_OB) {
      Object *ob = (Object *)tsep->id;