diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-07-27 02:33:58 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-27 02:33:58 +0400 |
commit | ac1aea71b1bcafb813dfc2133e6e4ed0c1ea633e (patch) | |
tree | 6420090a70caceaa8d258286d5011b5fee9ae771 /source/blender/editors/object | |
parent | b30e2a57fc31ae5d072a66dd0238f528a85fc074 (diff) |
bugfix [#22832] ctrl+shift+a on linked in group which is in a group makes outline green
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_add.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 5fa643200f4..1f4aff08183 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -973,7 +973,8 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base) 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; |