diff options
author | Ton Roosendaal <ton@blender.org> | 2011-01-12 21:00:23 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-01-12 21:00:23 +0300 |
commit | 604d029ddf164e87eb453d83c59e65c2f16f8879 (patch) | |
tree | c981354dab170549f1fb729e51e068f0cb0a8ecc /source/blender/editors | |
parent | 505e2d882af792480764791c070c19849477f774 (diff) |
Bugfix #25570
The tool-redo depends on a working undo system, so it can rewind
a step and then redo operator with new settings. When a user
disables undo, this won't work.
Now the properties for redo operator (toolbar, F6) will grey out
when a redo isn't possible.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/ED_particle.h | 1 | ||||
-rw-r--r-- | source/blender/editors/include/ED_sculpt.h | 1 | ||||
-rw-r--r-- | source/blender/editors/include/ED_util.h | 2 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 10 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_undo.c | 21 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_toolbar.c | 3 | ||||
-rw-r--r-- | source/blender/editors/util/editmode_undo.c | 14 | ||||
-rw-r--r-- | source/blender/editors/util/undo.c | 46 | ||||
-rw-r--r-- | source/blender/editors/util/util_intern.h | 1 |
9 files changed, 99 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h index 32b2b8194d2..77c4b1bbed6 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.h @@ -68,6 +68,7 @@ void PE_undo_step(struct Scene *scene, int step); void PE_undo(struct Scene *scene); void PE_redo(struct Scene *scene); void PE_undo_menu(struct Scene *scene, struct Object *ob); +int PE_undo_valid(struct Scene *scene); #endif /* ED_PARTICLE_H */ diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h index 506813ce626..f46ab37823b 100644 --- a/source/blender/editors/include/ED_sculpt.h +++ b/source/blender/editors/include/ED_sculpt.h @@ -51,5 +51,6 @@ void ED_keymap_paint(struct wmKeyConfig *keyconf); int ED_undo_paint_step(struct bContext *C, int type, int step, const char *name); void ED_undo_paint_free(void); +int ED_undo_paint_valid(int type, const char *name); #endif diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index 2936d63511c..626ca4bd1e8 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -56,6 +56,8 @@ int ED_undo_operator_repeat(struct bContext *C, struct wmOperator *op); void ED_undo_operator_repeat_cb(struct bContext *C, void *arg_op, void *arg_unused); void ED_undo_operator_repeat_cb_evt(struct bContext *C, void *arg_op, int arg_unused); +int ED_undo_valid (const struct bContext *C, const char *undoname); + /* undo_editmode.c */ void undo_editmode_push(struct bContext *C, const char *name, void * (*getdata)(struct bContext *C), diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 4ac4bf9fa9b..9ce8488c461 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3884,6 +3884,16 @@ void PE_undo_step(Scene *scene, int step) DAG_id_tag_update(&OBACT->id, OB_RECALC_DATA); } +int PE_undo_valid(Scene *scene) +{ + PTCacheEdit *edit= PE_get_current(scene, OBACT); + + if(edit) { + return (edit->undo.last != edit->undo.first); + } + return 0; +} + static void PTCacheUndo_number(Scene *scene, PTCacheEdit *edit, int nr) { PTCacheUndo *undo; diff --git a/source/blender/editors/sculpt_paint/paint_undo.c b/source/blender/editors/sculpt_paint/paint_undo.c index 758ef2a2fc1..6425e2d0494 100644 --- a/source/blender/editors/sculpt_paint/paint_undo.c +++ b/source/blender/editors/sculpt_paint/paint_undo.c @@ -239,6 +239,27 @@ int ED_undo_paint_step(bContext *C, int type, int step, const char *name) return 0; } +int ED_undo_paint_valid(int type, const char *name) +{ + UndoStack *stack; + + if(type == UNDO_PAINT_IMAGE) + stack= &ImageUndoStack; + else if(type == UNDO_PAINT_MESH) + stack= &MeshUndoStack; + else + return 0; + + if(stack->current==NULL); + else { + if(name && strcmp(stack->current->name, name) == 0) + return 1; + else + return stack->elems.first != stack->elems.last; + } + return 0; +} + void ED_undo_paint_free(void) { undo_stack_free(&ImageUndoStack); diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 730cc553ff3..33ba1dbb7f9 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -114,6 +114,9 @@ static void view3d_panel_operator_redo(const bContext *C, Panel *pa) return; block= uiLayoutGetBlock(pa->layout); + + if(ED_undo_valid(C, op->type->name)==0) + uiLayoutSetEnabled(pa->layout, 0); uiBlockSetFunc(block, ED_undo_operator_repeat_cb, op, NULL); diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c index cff30f12369..85f343e3311 100644 --- a/source/blender/editors/util/editmode_undo.c +++ b/source/blender/editors/util/editmode_undo.c @@ -314,6 +314,20 @@ void undo_editmode_name(bContext *C, const char *undoname) } } +/* undoname optionally, if NULL it just checks for existing undo steps */ +int undo_editmode_valid(const char *undoname) +{ + if(undoname) { + UndoElem *uel; + + for(uel= undobase.last; uel; uel= uel->prev) { + if(strcmp(undoname, uel->name)==0) + break; + } + return uel != NULL; + } + return undobase.last != undobase.first; +} /* ************** for interaction with menu/pullown */ diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 60f526b940a..0158719b2fb 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -199,6 +199,52 @@ void ED_undo_pop_op(bContext *C, wmOperator *op) ed_undo_step(C, 0, op->type->name); } +/* name optionally, function used to check for operator redo panel */ +int ED_undo_valid(const bContext *C, 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) { + return 1; + } + } + + if(sa && sa->spacetype==SPACE_TEXT) { + return 1; + } + else if(obedit) { + if ELEM7(obedit->type, OB_MESH, OB_FONT, OB_CURVE, OB_SURF, OB_MBALL, OB_LATTICE, OB_ARMATURE) { + return undo_editmode_valid(undoname); + } + } + else { + + /* if below tests fail, global undo gets executed */ + + if(obact && obact->mode & OB_MODE_TEXTURE_PAINT) { + if( ED_undo_paint_valid(UNDO_PAINT_IMAGE, undoname) ) + return 1; + } + else if(obact && obact->mode & OB_MODE_SCULPT) { + if( ED_undo_paint_valid(UNDO_PAINT_MESH, undoname) ) + return 1; + } + else if(obact && obact->mode & OB_MODE_PARTICLE_EDIT) { + return PE_undo_valid(CTX_data_scene(C)); + } + + if(U.uiflag & USER_GLOBALUNDO) { + return BKE_undo_valid(undoname); + } + } + return 0; +} + static int ed_undo_exec(bContext *C, wmOperator *UNUSED(op)) { /* "last operator" should disappear, later we can tie ths with undo stack nicer */ diff --git a/source/blender/editors/util/util_intern.h b/source/blender/editors/util/util_intern.h index 73675ab4ef9..b5750c55c87 100644 --- a/source/blender/editors/util/util_intern.h +++ b/source/blender/editors/util/util_intern.h @@ -34,6 +34,7 @@ /* editmode_undo.c */ void undo_editmode_clear(void); void undo_editmode_name(bContext *C, const char *undoname); +int undo_editmode_valid(const char *undoname); #endif /* ED_UTIL_INTERN_H */ |