diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-01-17 20:31:13 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-01-17 20:31:13 +0400 |
| commit | a8081c1d2bb9115833493b011bb93d6c08112b2d (patch) | |
| tree | 4383d080b80786257b291068e48a06bdb0ef5bd6 /source/blender/editors/object/object_edit.c | |
| parent | fcc54520d1f029b86cb8c6f43c239ef81090a99a (diff) | |
Uv Tools branch GSOC 2011
=========================
Documentation: http://wiki.blender.org/index.php/User:Psy-Fi/UV_Tools
Major features include:
*16 bit image support in viewport
*Subsurf aware unwrapping
*Smart Stitch(snap/rotate islands, preview, middlepoint/endpoint stitching)
*Seams from islands tool (marks seams and sharp, depending on settings)
*Uv Sculpting(Grab/Pinch/Rotate)
All tools are complete apart from stitching that is considered stable but with an extra edge mode under development(will be in soc-2011-onion-uv-tools).
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -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 61ba54e7d36..2dc170a8a23 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -88,7 +88,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" @@ -513,11 +513,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; } |