[Bf-blender-cvs] [03659c2cf9b] master: Merge branch 'blender-v2.83-release'

[Philipp Oeser]

Commit: 03659c2cf9b38eef65b7d1dcd4263ef8a5602bde
Author: Philipp Oeser
Date:   Fri May 15 13:47:04 2020 +0200
Branches: master
https://developer.blender.org/rB03659c2cf9b38eef65b7d1dcd4263ef8a5602bde

Merge branch 'blender-v2.83-release'

===================================================================



===================================================================

diff --cc source/blender/editors/object/object_collection.c
index b3155ab3ade,0822697d265..74ba94fbf4c
--- a/source/blender/editors/object/object_collection.c
+++ b/source/blender/editors/object/object_collection.c
@@@ -481,9 -481,25 +481,25 @@@ static int collection_link_exec(bContex
      return OPERATOR_FINISHED;
    }
  
+   /* 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.");
+     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.");
+     return OPERATOR_CANCELLED;
+   }
+ 
    /* Adding object to collection which is used as dupli-collection for self is bad idea.
     *
 -   * It is also  bad idea to add object to collection which is in collection which
 +   * It is also bad idea to add object to collection which is in collection which
     * contains our current object.
     */
    if (BKE_collection_object_cyclic_check(bmain, ob, collection)) {