From 0ba5cf245023e8c2310cdcbfe03d9da21d9330a5 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Fri, 14 Aug 2009 15:47:32 +0000 Subject: 2.5/Paint modes: * Fixed one of the items from Brecht's TODO mail. Exiting edit mode now restores any paint mode you might have been in, rather than going to object mode. --- source/blender/editors/object/object_edit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/object/object_edit.c') diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index a6bd38752ae..4cc3f22d5f8 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -3724,7 +3724,7 @@ void ED_object_exit_editmode(bContext *C, int flag) load_editMball(obedit); if(freedata) free_editMball(obedit); } - + /* freedata only 0 now on file saves */ if(freedata) { /* for example; displist make is different in editmode */ @@ -3739,6 +3739,8 @@ void ED_object_exit_editmode(bContext *C, int flag) WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, scene); } + + ED_view3d_restore_paint_modes(C, obedit->restore_mode); } @@ -3772,7 +3774,7 @@ void ED_object_enter_editmode(bContext *C, int flag) if(flag & EM_WAITCURSOR) waitcursor(1); - ED_view3d_exit_paint_modes(C); + ob->restore_mode = ED_view3d_exit_paint_modes(C); if(ob->type==OB_MESH) { Mesh *me= ob->data; -- cgit v1.2.3