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/space_view3d/space_view3d.c | |
| parent | 3fd388fb06e474a4e9e2f6816eb0a0b95ab433e7 (diff) | |
Fix #33241: can't exit edit mode when object gets hidden via animation.
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index ec564e95c65..4964c0054ac 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1119,16 +1119,21 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes return 1; } else if (CTX_data_equals(member, "active_base")) { - if (scene->basact && (scene->basact->lay & lay)) - if ((scene->basact->object->restrictflag & OB_RESTRICT_VIEW) == 0) + if (scene->basact && (scene->basact->lay & lay)) { + Object *ob = scene->basact->object; + /* if hidden but in edit mode, we still display, can happen with animation */ + if ((ob->restrictflag & OB_RESTRICT_VIEW) == 0 || (ob->mode & OB_MODE_EDIT)) CTX_data_pointer_set(result, &scene->id, &RNA_ObjectBase, scene->basact); + } return 1; } else if (CTX_data_equals(member, "active_object")) { - if (scene->basact && (scene->basact->lay & lay)) - if ((scene->basact->object->restrictflag & OB_RESTRICT_VIEW) == 0) + if (scene->basact && (scene->basact->lay & lay)) { + Object *ob = scene->basact->object; + if ((ob->restrictflag & OB_RESTRICT_VIEW) == 0 || (ob->mode & OB_MODE_EDIT)) CTX_data_id_pointer_set(result, &scene->basact->object->id); + } return 1; } |