diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-29 14:58:12 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-29 14:58:12 +0400 |
| commit | e0fd1bf4329f41e24ada5b880dd3e98a1dffb17d (patch) | |
| tree | c719056f0d9d2d1c615a23936a393eca7c9eb9a3 /source/blender/editors/object/object_edit.c | |
| parent | 946f291c46b5f7f481b42de1ecf1186608809fd8 (diff) | |
Fix T41227: Do not select unselectable items when unhiding them!
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index d416bfffc88..20e31e3909e 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -139,7 +139,9 @@ static int object_hide_view_clear_exec(bContext *C, wmOperator *UNUSED(op)) /* XXX need a context loop to handle such cases */ for (base = FIRSTBASE; base; base = base->next) { if ((base->lay & v3d->lay) && base->object->restrictflag & OB_RESTRICT_VIEW) { - base->flag |= SELECT; + if (!(base->object->restrictflag & OB_RESTRICT_SELECT)) { + base->flag |= SELECT; + } base->object->flag = base->flag; base->object->restrictflag &= ~OB_RESTRICT_VIEW; changed = true; |