diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-11 23:23:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-11 23:23:02 +0400 |
| commit | c280002879174e3f0fe5eb91501cfa0cc407358f (patch) | |
| tree | 1211a97b48104077fb6ab0c96f571e4b4c84e292 /source/blender/windowmanager | |
| parent | 4b66bd37485fe629d58cb66e582e21038ac99427 (diff) | |
fix [#29579] Redo brolken when jobs are running
changes
* undo now checks screen jobs only, was checking all jobs before so a material preview could make an undo fail.
now this is only limiteds for render/fluid bake/bake.
* the redo UI is now disabled when screen operators run.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/WM_api.h | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 2c0e22337c0..5bd95ac2106 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -206,6 +206,7 @@ void WM_operator_properties_gesture_border(struct wmOperatorType *ot, int exten void WM_operator_properties_gesture_straightline(struct wmOperatorType *ot, int cursor); void WM_operator_properties_select_all(struct wmOperatorType *ot); +int WM_operator_check_ui_enabled(const struct bContext *C, const char *idname); wmOperator *WM_operator_last_redo(const struct bContext *C); /* MOVE THIS SOMEWHERE ELSE */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index fa6521b3ec0..31d276fee01 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -907,6 +907,15 @@ int WM_operator_winactive(bContext *C) return 1; } +/* return FALSE, if the UI should be disabled */ +int WM_operator_check_ui_enabled(const bContext *C, const char *idname) +{ + wmWindowManager *wm= CTX_wm_manager(C); + Scene *scene= CTX_data_scene(C); + + return !(ED_undo_valid(C, idname)==0 || WM_jobs_test(wm, scene)); +} + wmOperator *WM_operator_last_redo(const bContext *C) { wmWindowManager *wm= CTX_wm_manager(C); @@ -940,7 +949,7 @@ static uiBlock *wm_block_create_redo(bContext *C, ARegion *ar, void *arg_op) uiBlockSetHandleFunc(block, ED_undo_operator_repeat_cb_evt, arg_op); layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, width, UI_UNIT_Y, style); - if(ED_undo_valid(C, op->type->name)==0) + if (!WM_operator_check_ui_enabled(C, op->type->name)) uiLayoutSetEnabled(layout, 0); if(op->type->flag & OPTYPE_MACRO) { |