diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-12-08 20:51:25 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-12-08 20:51:25 +0300 |
| commit | 925077f74450f61f43f694063f1f5dde3d4be587 (patch) | |
| tree | d9c9ba436895125c7f98d93f91099dda09edbdd9 /source/blender/editors/space_outliner | |
| parent | 071b61259bbbe9c3b4d6da2410b6914ecb89200e (diff) | |
Bugfix #25099
Outliner: group view: restrict buttons should be disabled in editmode.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 7426fca844e..a9d75891bb4 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -4997,11 +4997,14 @@ static void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag) } else { for(gob= gr->gobject.first; gob; gob= gob->next) { - gob->ob->restrictflag |= flag; + /* not in editmode */ + if(scene->obedit!=gob->ob) { + gob->ob->restrictflag |= flag; - if(flag==OB_RESTRICT_VIEW) - if((gob->ob->flag & SELECT) == 0) - ED_base_object_select(object_in_scene(gob->ob, scene), BA_SELECT); + if(flag==OB_RESTRICT_VIEW) + if((gob->ob->flag & SELECT) == 0) + ED_base_object_select(object_in_scene(gob->ob, scene), BA_SELECT); + } } } } |