Merge branch 'master' into refactor-mesh-hide-generic

2 files changed, 70 insertions, 8 deletions

diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index 4657f7e9a9f..84ddea368e7 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -39,6 +39,7 @@ const EnumPropertyItem rna_enum_collection_color_items[] = {
 
 #  include "DEG_depsgraph.h"
 #  include "DEG_depsgraph_build.h"
+#  include "DEG_depsgraph_query.h"
 
 #  include "BKE_collection.h"
 #  include "BKE_global.h"
@@ -79,26 +80,45 @@ static PointerRNA rna_Collection_objects_get(CollectionPropertyIterator *iter)
   return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, cob->ob);
 }
 
-static void rna_Collection_objects_link(Collection *collection,
-                                        Main *bmain,
-                                        ReportList *reports,
-                                        Object *object)
+static bool rna_collection_objects_edit_check(Collection *collection,
+                                              ReportList *reports,
+                                              Object *object)
 {
+  if (!DEG_is_original_id(&collection->id)) {
+    BKE_reportf(
+        reports, RPT_ERROR, "Collection '%s' is not an original ID", collection->id.name + 2);
+    return false;
+  }
+  if (!DEG_is_original_id(&object->id)) {
+    BKE_reportf(reports, RPT_ERROR, "Collection '%s' is not an original ID", object->id.name + 2);
+    return false;
+  }
   /* Currently this should not be allowed (might be supported in the future though...). */
   if (ID_IS_OVERRIDE_LIBRARY(&collection->id)) {
     BKE_reportf(reports,
                 RPT_ERROR,
-                "Could not link the object '%s' because the collection '%s' is overridden",
+                "Could not (un)link the object '%s' because the collection '%s' is overridden",
                 object->id.name + 2,
                 collection->id.name + 2);
-    return;
+    return false;
   }
   if (ID_IS_LINKED(&collection->id)) {
     BKE_reportf(reports,
                 RPT_ERROR,
-                "Could not link the object '%s' because the collection '%s' is linked",
+                "Could not (un)link the object '%s' because the collection '%s' is linked",
                 object->id.name + 2,
                 collection->id.name + 2);
+    return false;
+  }
+  return true;
+}
+
+static void rna_Collection_objects_link(Collection *collection,
+                                        Main *bmain,
+                                        ReportList *reports,
+                                        Object *object)
+{
+  if (!rna_collection_objects_edit_check(collection, reports, object)) {
     return;
   }
   if (!BKE_collection_object_add(bmain, collection, object)) {
@@ -120,6 +140,9 @@ static void rna_Collection_objects_unlink(Collection *collection,
                                           ReportList *reports,
                                           Object *object)
 {
+  if (!rna_collection_objects_edit_check(collection, reports, object)) {
+    return;
+  }
   if (!BKE_collection_object_remove(bmain, collection, object, false)) {
     BKE_reportf(reports,
                 RPT_ERROR,
@@ -204,11 +227,47 @@ static PointerRNA rna_Collection_children_get(CollectionPropertyIterator *iter)
   return rna_pointer_inherit_refine(&iter->parent, &RNA_Collection, child->collection);
 }
 
+static bool rna_collection_children_edit_check(Collection *collection,
+                                               ReportList *reports,
+                                               Collection *child)
+{
+  if (!DEG_is_original_id(&collection->id)) {
+    BKE_reportf(
+        reports, RPT_ERROR, "Collection '%s' is not an original ID", collection->id.name + 2);
+    return false;
+  }
+  if (!DEG_is_original_id(&child->id)) {
+    BKE_reportf(reports, RPT_ERROR, "Collection '%s' is not an original ID", child->id.name + 2);
+    return false;
+  }
+  /* Currently this should not be allowed (might be supported in the future though...). */
+  if (ID_IS_OVERRIDE_LIBRARY(&collection->id)) {
+    BKE_reportf(reports,
+                RPT_ERROR,
+                "Could not (un)link the collection '%s' because the collection '%s' is overridden",
+                child->id.name + 2,
+                collection->id.name + 2);
+    return false;
+  }
+  if (ID_IS_LINKED(&collection->id)) {
+    BKE_reportf(reports,
+                RPT_ERROR,
+                "Could not (un)link the collection '%s' because the collection '%s' is linked",
+                child->id.name + 2,
+                collection->id.name + 2);
+    return false;
+  }
+  return true;
+}
+
 static void rna_Collection_children_link(Collection *collection,
                                          Main *bmain,
                                          ReportList *reports,
                                          Collection *child)
 {
+  if (!rna_collection_children_edit_check(collection, reports, child)) {
+    return;
+  }
   if (!BKE_collection_child_add(bmain, collection, child)) {
     BKE_reportf(reports,
                 RPT_ERROR,
@@ -228,6 +287,9 @@ static void rna_Collection_children_unlink(Collection *collection,
                                            ReportList *reports,
                                            Collection *child)
 {
+  if (!rna_collection_children_edit_check(collection, reports, child)) {
+    return;
+  }
   if (!BKE_collection_child_remove(bmain, collection, child)) {
     BKE_reportf(reports,
                 RPT_ERROR,
diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c
index 0e307f5b424..4247b830efa 100644
--- a/source/blender/makesrna/intern/rna_wm_gizmo.c
+++ b/source/blender/makesrna/intern/rna_wm_gizmo.c
@@ -1402,7 +1402,7 @@ static void rna_def_gizmogroup(BlenderRNA *brna)
        "TOOL_FALLBACK_KEYMAP",
        0,
        "Use fallback tools keymap",
-       "Add fallback tools keymap to this gizmo type."},
+       "Add fallback tools keymap to this gizmo type"},
       {WM_GIZMOGROUPTYPE_VR_REDRAWS,
        "VR_REDRAWS",
        0,