diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-21 07:33:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-21 07:33:34 +0400 |
| commit | f68b5505878d5ae63c83943ed29f04e89b64ea80 (patch) | |
| tree | 126ead1cf9c4cf19553bb3f18cc2b6bf01bd8e9b /source/blender/editors/object | |
| parent | 3fd388fb06e474a4e9e2f6816eb0a0b95ab433e7 (diff) | |
Fix #33241: can't exit edit mode when object gets hidden via animation.
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 4d6b9ed10bb..d39e34824b9 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -550,7 +550,8 @@ static int editmode_toggle_poll(bContext *C) if (ELEM(NULL, ob, ob->data) || ((ID *)ob->data)->lib) return 0; - if (ob->restrictflag & OB_RESTRICT_VIEW) + /* if hidden but in edit mode, we still display */ + if ((ob->restrictflag & OB_RESTRICT_VIEW) && !(ob->mode & OB_MODE_EDIT)) return 0; return (ob->type == OB_MESH || ob->type == OB_ARMATURE || |