Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-02-09 15:20:59 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-02-09 15:24:31 +0300
commitaf0eb938b8884da3b5fcca4e32b47034eb33e9c6 (patch)
tree1a0bda31b344fb5d160bf3ff0fd765de64f7b182 /source/blender/editors/object/object_relations.c
parentbf4f01779d818be876fde59914597308544c4d3a (diff)
Fix T61276: Make Single User unlinks original object.
In that case, we have to consider number of scenes using an object, not number of collections.
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
-rw-r--r--source/blender/editors/object/object_relations.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 6ce3eab5758..970a64d5e78 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1596,7 +1596,7 @@ static void single_object_users_collection(
Object *ob = cob->ob;
/* an object may be in more than one collection */
if ((ob->id.newid == NULL) && ((ob->flag & flag) == flag)) {
- if (!ID_IS_LINKED(ob) && ob->id.us > 1) {
+ if (!ID_IS_LINKED(ob) && BKE_object_scenes_users_get(bmain, ob) > 1) {
ID_NEW_SET(ob, BKE_object_copy(bmain, ob));
}
}