[Bf-blender-cvs] [c4ce4034e67] blender2.8: Fix T55344: linked collection instance has user count 0.

[Brecht Van Lommel]

Commit: c4ce4034e67b8d7030e6ec932b264984e007e371
Author: Brecht Van Lommel
Date:   Wed Jun 6 11:08:56 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc4ce4034e67b8d7030e6ec932b264984e007e371

Fix T55344: linked collection instance has user count 0.

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/object/object_group.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4afde29d538..a9f93dff9e6 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10064,6 +10064,7 @@ static void add_collections_to_scene(
 
 				/* Assign the collection. */
 				ob->dup_group = collection;
+				id_us_plus(&collection->id);
 				ob->transflag |= OB_DUPLICOLLECTION;
 				copy_v3_v3(ob->loc, scene->cursor.location);
 			}
diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c
index debbe4bd379..8a52b6c5ef5 100644
--- a/source/blender/editors/object/object_group.c
+++ b/source/blender/editors/object/object_group.c
@@ -361,6 +361,7 @@ static int collection_create_exec(bContext *C, wmOperator *op)
 	RNA_string_get(op->ptr, "name", name);
 
 	Collection *collection = BKE_collection_add(bmain, NULL, name);
+	id_fake_user_set(&collection->id);
 
 	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
 	{
@@ -402,6 +403,7 @@ static int collection_add_exec(bContext *C, wmOperator *UNUSED(op))
 		return OPERATOR_CANCELLED;
 
 	Collection *collection = BKE_collection_add(bmain, NULL, "Collection");
+	id_fake_user_set(&collection->id);
 	BKE_collection_object_add(bmain, collection, ob);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);