diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-26 14:05:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-26 14:05:22 +0300 |
| commit | b1475ae2c6e991ee4f9b1eb73f207f7b91a194c2 (patch) | |
| tree | e3afc2725cf12965896410f4e2397e9430fc6743 /source | |
| parent | 666cca69e90bf1f5c1bfb5a6582c56c2e8311f04 (diff) | |
Fix vertex paint not getting restored after exiting editmode,
and fix the opposite problem when going to object mode from the menu.
(commit 27747 by Brecht from render25 branch)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 976990deda8..dcf4c072f92 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -305,7 +305,6 @@ 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); } } @@ -348,8 +347,7 @@ 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; + ob->mode= OB_MODE_EDIT; if(ob->type==OB_MESH) { Mesh *me= ob->data; |