diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-08 19:34:41 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-08 19:34:41 +0400 |
| commit | 5e749af4295ba3120cd882f6e35b49a80292915e (patch) | |
| tree | 2b350597577eb619dd3192dc5250a7fbbb4fb6f0 /source/blender/editors/util | |
| parent | f3fd7d88002dcfe42e51738cbb7d2d2be756dd19 (diff) | |
2.5: Various Fixes
* Context panel now draws without header, with arrows, no scene name.
* Softbody vertex group search popup.
* Improve names for autogenerated shortcut keys in menus.
* Make most Select menus in the 3D view header work.
* Fix armature border select selection syncing.
* Add POSE_OT_select_constraint_target,
MESH_OT_select_by_number_vertices, MESH_OT_select_vertex_path.
* Merge mesh select similar into one operator.
* Don't give MESH_OT_select_random Space hotkey.
* Add DAG_object_flush_update to many mesh edit tools, not calling this
will crash with modifiers.
* RNA_def_enum_funcs for dynamic enums in operators, but not very useful
without context yet.
* Fix refresh issue with image window header + editmode.
* Fix drawing of shadow mesh for image painting.
* Remove deprecated uiDefMenuButO and uiDefMenuSep functions.
* Remove keyval.c, code is in wm_keymap.c already.
* Rename WM_operator_redo to WM_operator_props_popup.
Diffstat (limited to 'source/blender/editors/util')
| -rw-r--r-- | source/blender/editors/util/undo.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 1d79c542fa9..6f742d70440 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -125,7 +125,18 @@ static int ed_undo_step(bContext *C, int step) { Object *obedit= CTX_data_edit_object(C); ScrArea *sa= CTX_wm_area(C); - + + if(sa && sa->spacetype==SPACE_IMAGE) { + SpaceImage *sima= (SpaceImage *)sa->spacedata.first; + + if(G.f & G_TEXTUREPAINT || sima->flag & SI_DRAWTOOL) { + undo_imagepaint_step(step); + + WM_event_add_notifier(C, NC_WINDOW, NULL); + return OPERATOR_FINISHED; + } + } + if(sa && sa->spacetype==SPACE_TEXT) { ED_text_undo_step(C, step); } @@ -138,13 +149,6 @@ static int ed_undo_step(bContext *C, int step) if(G.f & G_TEXTUREPAINT) undo_imagepaint_step(step); - else if(sa && sa->spacetype==SPACE_IMAGE) { - SpaceImage *sima= (SpaceImage *)sa->spacedata.first; - if(sima->flag & SI_DRAWTOOL) - undo_imagepaint_step(step); - else - do_glob_undo= 1; - } else if(G.f & G_PARTICLEEDIT) { if(step==1) PE_undo(CTX_data_scene(C)); |