5 files changed, 20 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index e01f6a6b751..b03686ca241 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -27,7 +27,7 @@
  * \note Use #STRINGIFY() rather than defining with quotes.
  */
 #define BLENDER_VERSION 280
-#define BLENDER_SUBVERSION 60
+#define BLENDER_SUBVERSION 61
 /** Several breakages with 280, e.g. collections vs layers. */
 #define BLENDER_MINVERSION 280
 #define BLENDER_MINSUBVERSION 0
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 47786629aed..0e093bb086b 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -161,6 +161,8 @@ bool BKE_collection_move(struct Main *bmain,
 
 bool BKE_collection_find_cycle(struct Collection *new_ancestor, struct Collection *collection);
 
+bool BKE_collection_has_collection(struct Collection *parent, struct Collection *collection);
+
 /* Iteration callbacks. */
 
 typedef void (*BKE_scene_objects_Cb)(struct Object *ob, void *data);
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index d33d4e344b5..a7d23eff726 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -434,8 +434,8 @@ static void collection_object_cache_fill(ListBase *lb, Collection *collection, i
 
     int object_restrict = base->object->restrictflag;
 
-    if (((child_restrict & COLLECTION_RESTRICT_VIEW) == 0) &&
-        ((object_restrict & OB_RESTRICT_VIEW) == 0)) {
+    if (((child_restrict & COLLECTION_RESTRICT_INSTANCE) == 0) &&
+        ((object_restrict & OB_RESTRICT_INSTANCE) == 0)) {
       base->flag |= BASE_ENABLED_VIEWPORT;
     }
 
@@ -966,6 +966,11 @@ static bool collection_find_child_recursive(Collection *parent, Collection *coll
   return false;
 }
 
+bool BKE_collection_has_collection(Collection *parent, Collection *collection)
+{
+  return collection_find_child_recursive(parent, collection);
+}
+
 static CollectionParent *collection_find_parent(Collection *child, Collection *collection)
 {
   return BLI_findptr(&child->parents, collection, offsetof(CollectionParent, collection));
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index fc349e62809..0eb2252cbfb 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -693,7 +693,7 @@ static short layer_collection_sync(ViewLayer *view_layer,
       lc->runtime_flag = child_runtime_flag;
     }
 
-    if (((child_restrict & COLLECTION_RESTRICT_VIEW) == 0) &&
+    if (((child_restrict & COLLECTION_RESTRICT_INSTANCE) == 0) &&
         ((child_layer_restrict & LAYER_COLLECTION_RESTRICT_VIEW) == 0)) {
       lc->runtime_flag |= LAYER_COLLECTION_VISIBLE;
     }
@@ -723,7 +723,7 @@ static short layer_collection_sync(ViewLayer *view_layer,
         BLI_addtail(new_object_bases, base);
       }
 
-      if ((child_restrict & COLLECTION_RESTRICT_VIEW) == 0) {
+      if ((child_restrict & COLLECTION_RESTRICT_INSTANCE) == 0) {
         base->flag_from_collection |= BASE_ENABLED_VIEWPORT;
         if ((child_layer_restrict & LAYER_COLLECTION_RESTRICT_VIEW) == 0) {
           base->flag_from_collection |= BASE_VISIBLE;
@@ -1014,8 +1014,8 @@ bool BKE_layer_collection_isolate(Scene *scene,
   bool hide_it = extend && (lc->runtime_flag & LAYER_COLLECTION_VISIBLE);
 
   if ((!ID_IS_LINKED(lc->collection) && !hide_it)) {
-    if (lc->collection->flag & COLLECTION_RESTRICT_VIEW) {
-      lc->collection->flag &= ~COLLECTION_RESTRICT_VIEW;
+    if (lc->collection->flag & COLLECTION_RESTRICT_INSTANCE) {
+      lc->collection->flag &= ~COLLECTION_RESTRICT_INSTANCE;
       depsgraph_need_update = true;
     }
   }
@@ -1044,8 +1044,8 @@ bool BKE_layer_collection_isolate(Scene *scene,
 
     while (lc_parent != lc) {
       if (!ID_IS_LINKED(lc_parent->collection)) {
-        if (lc_parent->collection->flag & COLLECTION_RESTRICT_VIEW) {
-          lc_parent->collection->flag &= ~COLLECTION_RESTRICT_VIEW;
+        if (lc_parent->collection->flag & COLLECTION_RESTRICT_INSTANCE) {
+          lc_parent->collection->flag &= ~COLLECTION_RESTRICT_INSTANCE;
           depsgraph_need_update = true;
         }
       }
@@ -1109,8 +1109,8 @@ bool BKE_layer_collection_set_visible(ViewLayer *view_layer,
   bool depsgraph_changed = false;
 
   if (visible && (!ID_IS_LINKED(lc->collection)) &&
-      ((lc->collection->flag & COLLECTION_RESTRICT_VIEW) != 0)) {
-    lc->collection->flag &= ~COLLECTION_RESTRICT_VIEW;
+      ((lc->collection->flag & COLLECTION_RESTRICT_INSTANCE) != 0)) {
+    lc->collection->flag &= ~COLLECTION_RESTRICT_INSTANCE;
     depsgraph_changed = true;
   }
 
@@ -1491,7 +1491,7 @@ void BKE_base_eval_flags(Base *base)
 
   /* Apply object restrictions. */
   const int object_restrict = base->object->restrictflag;
-  if (object_restrict & OB_RESTRICT_VIEW) {
+  if (object_restrict & OB_RESTRICT_INSTANCE) {
     base->flag &= ~BASE_ENABLED_VIEWPORT;
   }
   if (object_restrict & OB_RESTRICT_RENDER) {
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 8080834a53a..044d6da9466 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -1082,7 +1082,7 @@ static const DupliGenerator *get_dupli_generator(const DupliContext *ctx)
 
   /* Should the dupli's be generated for this object? - Respect restrict flags */
   if (DEG_get_mode(ctx->depsgraph) == DAG_EVAL_RENDER ? (restrictflag & OB_RESTRICT_RENDER) :
-                                                        (restrictflag & OB_RESTRICT_VIEW)) {
+                                                        (restrictflag & OB_RESTRICT_INSTANCE)) {
     return NULL;
   }