Sculpt: split generic part of image paint undo system into separate
[blender-staging.git] / source / blender / editors / util / undo.c
index 62ce76a7614cce8549e2bc7c5a52d932438bc149..18e3304c1910a48e08da37156a630ce2d1d4c382 100644 (file)
@@ -58,6 +58,7 @@
 #include "ED_armature.h"
 #include "ED_particle.h"
 #include "ED_curve.h"
+#include "ED_mball.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
 #include "ED_screen.h"
 #include "UI_interface.h"
 #include "UI_resources.h"
 
-/* ***************** generic undo system ********************* */
+#include "util_intern.h"
 
-/* ********* XXX **************** */
-static void undo_push_mball() {}
-static void sound_initialize_sounds() {}
-/* ********* XXX **************** */
+/* ***************** generic undo system ********************* */
 
 void ED_undo_push(bContext *C, char *str)
 {
        wmWindowManager *wm= CTX_wm_manager(C);
        Object *obedit= CTX_data_edit_object(C);
-       
+       Object *obact= CTX_data_active_object(C);
+
        if(obedit) {
                if (U.undosteps == 0) return;
                
@@ -93,13 +92,13 @@ void ED_undo_push(bContext *C, char *str)
                else if (obedit->type==OB_FONT)
                        undo_push_font(C, str);
                else if (obedit->type==OB_MBALL)
-                       undo_push_mball(str);
+                       undo_push_mball(C, str);
                else if (obedit->type==OB_LATTICE)
                        undo_push_lattice(C, str);
                else if (obedit->type==OB_ARMATURE)
                        undo_push_armature(C, str);
        }
-       else if(G.f & G_PARTICLEEDIT) {
+       else if(obact && obact->mode & OB_MODE_PARTICLE_EDIT) {
                if (U.undosteps == 0) return;
                
                PE_undo_push(CTX_data_scene(C), str);
@@ -115,37 +114,40 @@ void ED_undo_push(bContext *C, char *str)
        }
 }
 
-void ED_undo_push_op(bContext *C, wmOperator *op)
-{
-       /* in future, get undo string info? */
-       ED_undo_push(C, op->type->name);
-}
-
-static int ed_undo_step(bContext *C, int step)
+static int ed_undo_step(bContext *C, int step, const char *undoname)
 {      
        Object *obedit= CTX_data_edit_object(C);
+       Object *obact= CTX_data_active_object(C);
        ScrArea *sa= CTX_wm_area(C);
-       
+
+       if(sa && sa->spacetype==SPACE_IMAGE) {
+               SpaceImage *sima= (SpaceImage *)sa->spacedata.first;
+               
+               if((obact && obact->mode & OB_MODE_TEXTURE_PAINT) || sima->flag & SI_DRAWTOOL) {
+                       ED_undo_paint_step(C, UNDO_PAINT_IMAGE, step);
+
+                       WM_event_add_notifier(C, NC_WINDOW, NULL);
+                       return OPERATOR_FINISHED;
+               }
+       }
+
        if(sa && sa->spacetype==SPACE_TEXT) {
                ED_text_undo_step(C, step);
        }
        else if(obedit) {
-               if ELEM7(obedit->type, OB_MESH, OB_FONT, OB_CURVE, OB_SURF, OB_MBALL, OB_LATTICE, OB_ARMATURE)
-                       undo_editmode_step(C, step);
+               if ELEM7(obedit->type, OB_MESH, OB_FONT, OB_CURVE, OB_SURF, OB_MBALL, OB_LATTICE, OB_ARMATURE) {
+                       if(undoname)
+                               undo_editmode_name(C, undoname);
+                       else
+                               undo_editmode_step(C, step);
+               }
        }
        else {
                int do_glob_undo= 0;
                
-               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(obact && obact->mode & OB_MODE_TEXTURE_PAINT)
+                       ED_undo_paint_step(C, UNDO_PAINT_IMAGE, step);
+               else if(obact && obact->mode & OB_MODE_PARTICLE_EDIT) {
                        if(step==1)
                                PE_undo(CTX_data_scene(C));
                        else
@@ -160,8 +162,10 @@ static int ed_undo_step(bContext *C, int step)
 #ifndef DISABLE_PYTHON
                                // XXX          BPY_scripts_clear_pyobjects();
 #endif
-                               BKE_undo_step(C, step);
-                               sound_initialize_sounds();
+                               if(undoname)
+                                       BKE_undo_name(C, undoname);
+                               else
+                                       BKE_undo_step(C, step);
                        }
                        
                }
@@ -174,32 +178,48 @@ static int ed_undo_step(bContext *C, int step)
 
 void ED_undo_pop(bContext *C)
 {
-       ed_undo_step(C, 1);
+       ed_undo_step(C, 1, NULL);
 }
 void ED_undo_redo(bContext *C)
 {
-       ed_undo_step(C, -1);
+       ed_undo_step(C, -1, NULL);
+}
+
+void ED_undo_push_op(bContext *C, wmOperator *op)
+{
+       /* in future, get undo string info? */
+       ED_undo_push(C, op->type->name);
+}
+
+void ED_undo_pop_op(bContext *C, wmOperator *op)
+{
+       /* search back a couple of undo's, in case something else added pushes */
+       ed_undo_step(C, 0, op->type->name);
 }
 
 static int ed_undo_exec(bContext *C, wmOperator *op)
 {
-       return ed_undo_step(C, 1);
+       /* "last operator" should disappear, later we can tie ths with undo stack nicer */
+       WM_operator_stack_clear(C);
+       return ed_undo_step(C, 1, NULL);
 }
+
 static int ed_redo_exec(bContext *C, wmOperator *op)
 {
-       return ed_undo_step(C, -1);
+       return ed_undo_step(C, -1, NULL);
 }
 
 void ED_undo_menu(bContext *C)
 {
        Object *obedit= CTX_data_edit_object(C);
+       Object *obact= CTX_data_active_object(C);
        
        if(obedit) {
                //if ELEM7(obedit->type, OB_MESH, OB_FONT, OB_CURVE, OB_SURF, OB_MBALL, OB_LATTICE, OB_ARMATURE)
                //      undo_editmode_menu();
        }
        else {
-               if(G.f & G_PARTICLEEDIT)
+               if(obact && obact->mode & OB_MODE_PARTICLE_EDIT)
                        PE_undo_menu(CTX_data_scene(C), CTX_data_active_object(C));
                else if(U.uiflag & USER_GLOBALUNDO) {
                        char *menu= BKE_undo_menu_string();
@@ -208,7 +228,6 @@ void ED_undo_menu(bContext *C)
                                MEM_freeN(menu);
                                if(event>0) {
                                        BKE_undo_number(C, event);
-                                       sound_initialize_sounds();
                                }
                        }
                }
@@ -221,6 +240,7 @@ void ED_OT_undo(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Undo";
+    ot->description= "Undo previous action.";
        ot->idname= "ED_OT_undo";
        
        /* api callbacks */
@@ -232,6 +252,7 @@ void ED_OT_redo(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Redo";
+    ot->description= "Redo previous action.";
        ot->idname= "ED_OT_redo";
        
        /* api callbacks */