[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30778] trunk/blender/source/blender/ editors/object/object_add.c: bugfix [#22832] ctrl+shift+a on linked in group which is in a group makes outline green

[Campbell Barton]

Revision: 30778
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30778
Author:   campbellbarton
Date:     2010-07-27 00:33:58 +0200 (Tue, 27 Jul 2010)

Log Message:
-----------
bugfix [#22832] ctrl+shift+a on linked in group which is in a group makes outline green

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2010-07-26 21:37:55 UTC (rev 30777)
+++ trunk/blender/source/blender/editors/object/object_add.c	2010-07-26 22:33:58 UTC (rev 30778)
@@ -973,7 +973,8 @@
 		if(ob->mat==NULL) ob->totcol= 0;
 		
 		basen= MEM_dupallocN(base);
-		basen->flag &= ~OB_FROMDUPLI;
+		basen->flag &= ~(OB_FROMDUPLI|OB_FROMGROUP);
+		ob->flag= basen->flag;
 		basen->lay= base->lay;
 		BLI_addhead(&scene->base, basen);	/* addhead: othwise eternal loop */
 		basen->object= ob;