[Bf-blender-cvs] [b6725d3cbf9] blender2.8: Fix wrong object user count on duplicate.

[Brecht Van Lommel]

Commit: b6725d3cbf947ad60e701fa34aca35f5f5dc3125
Author: Brecht Van Lommel
Date:   Wed May 23 18:53:37 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb6725d3cbf947ad60e701fa34aca35f5f5dc3125

Fix wrong object user count on duplicate.

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

M	source/blender/blenkernel/intern/object.c
M	source/blender/editors/object/object_relations.c

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 8e50d1b32e1..9a1799ffb09 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1220,6 +1220,10 @@ Object *BKE_object_copy(Main *bmain, const Object *ob)
 {
 	Object *ob_copy;
 	BKE_id_copy_ex(bmain, &ob->id, (ID **)&ob_copy, 0, false);
+
+	/* We increase object user count when linking to Collections. */
+	id_us_min(&ob_copy->id);
+
 	return ob_copy;
 }
 
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index c5cf946cfb3..6925daa4b6c 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1636,6 +1636,7 @@ static Object *single_object_users_object(Main *bmain, Scene *scene, Object *ob)
 		}
 	}
 
+	id_us_plus(&obn->id);
 	id_us_min(&ob->id);
 	return obn;
 }