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:
authorCampbell Barton <ideasman42@gmail.com>2014-05-01 00:49:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-01 00:52:10 +0400
commit2ce3e4639a9bc45f339386c2b5d4b7dedb905b26 (patch)
tree8bf7fbd74fb80ea1900b9ead2b7595cfe94ab9ce
parentd2a326076342845fc5e0bcfc4ea10b09ce86242e (diff)
Fix for making single user objects setting FROMGROUP flag incorrectly
-rw-r--r--source/blender/editors/object/object_relations.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 81e05ca7dbd..c06592c4c9d 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1717,6 +1717,17 @@ static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, int flag
/* base gets copy of object */
obn = BKE_object_copy(ob);
base->object = obn;
+
+ if (copy_groups) {
+ if (ob->flag & OB_FROMGROUP) {
+ obn->flag |= OB_FROMGROUP;
+ }
+ }
+ else {
+ /* copy already clears */
+ }
+ base->flag = obn->flag;
+
ob->id.us--;
}
}