[Bf-blender-cvs] [2ce3e46] master: Fix for making single user objects setting FROMGROUP flag incorrectly

Campbell Barton noreply at git.blender.org
Wed Apr 30 22:53:01 CEST 2014


Commit: 2ce3e4639a9bc45f339386c2b5d4b7dedb905b26
Author: Campbell Barton
Date:   Thu May 1 06:49:38 2014 +1000
https://developer.blender.org/rB2ce3e4639a9bc45f339386c2b5d4b7dedb905b26

Fix for making single user objects setting FROMGROUP flag incorrectly

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

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

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

diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 81e05ca..c06592c 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--;
 			}
 		}




More information about the Bf-blender-cvs mailing list