diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 06:49:37 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 06:49:37 +0400 |
| commit | c0718d2d4ab6a5ee51ca6164cfc44256867d8701 (patch) | |
| tree | b7bce15ddc6b0805d0c582bd7289791a48d1b8dc /source/blender/editors/object/object_edit.c | |
| parent | abcdc909ebe64703da50bf9388d36812625d9d39 (diff) | |
2.5:
* Updated object mode flags with Object and Edit.
* Updated RNA for that property
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index b849d57cc7d..eb4150feb0c 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -3732,6 +3732,7 @@ void ED_object_exit_editmode(bContext *C, int flag) WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, scene); } + obedit->mode &= ~OB_MODE_EDIT; ED_object_toggle_modes(C, obedit->restore_mode); } @@ -3768,6 +3769,8 @@ void ED_object_enter_editmode(bContext *C, int flag) ob->restore_mode = ob->mode; ED_object_toggle_modes(C, ob->mode); + + ob->mode |= OB_MODE_EDIT; if(ob->type==OB_MESH) { Mesh *me= ob->data; |