diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 01:08:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 01:08:25 +0400 |
| commit | 0f28c1c27aec41dd22e31aac2c02cdfae785dd1b (patch) | |
| tree | 1c41b37d29a56390d810846cd7fe8f1218e40576 /source/blender/editors/object | |
| parent | 9be40c026df54fee796c4073ebd4734c55ed5807 (diff) | |
| parent | 408f7963c5cfd65792d826390b01896282de8e97 (diff) | |
svn merge ^/trunk/blender -r43461:43472
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 5f313301e2e..a7ac91d13df 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -89,7 +89,7 @@ #include "ED_object.h" #include "ED_screen.h" #include "ED_util.h" - +#include "ED_image.h" #include "RNA_access.h" #include "RNA_define.h" @@ -514,11 +514,15 @@ void ED_object_enter_editmode(bContext *C, int flag) static int editmode_toggle_exec(bContext *C, wmOperator *UNUSED(op)) { + ToolSettings *toolsettings = CTX_data_tool_settings(C); + if(!CTX_data_edit_object(C)) ED_object_enter_editmode(C, EM_WAITCURSOR); else ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls undo too [#24685] */ + ED_space_image_uv_sculpt_update(CTX_wm_manager(C), toolsettings); + return OPERATOR_FINISHED; } |