bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

UI: fix for glitch where active button became inactive on undo

Browse Source
This commit is contained in:
Campbell Barton 2014-02-15 13:28:26 +11:00
parent 77a15aba38
commit 8572ae89cd
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/util/undo.c
View File

@ -122,13 +122,16 @@ void ED_undo_push(bContext *C, const char *str)
/* note: also check undo_history_exec() in bottom if you change notifiers */ /* note: also check undo_history_exec() in bottom if you change notifiers */
static int ed_undo_step(bContext *C, int step, const char *undoname) static int ed_undo_step(bContext *C, int step, const char *undoname)
{ {
wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win = CTX_wm_window(C);
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C); Object *obedit = CTX_data_edit_object(C);
Object *obact = CTX_data_active_object(C); Object *obact = CTX_data_active_object(C);
ScrArea *sa = CTX_wm_area(C); ScrArea *sa = CTX_wm_area(C);
/* undo during jobs are running can easily lead to freeing data using by jobs, /* undo during jobs are running can easily lead to freeing data using by jobs,
* or they can just lead to freezing job in some other cases */ * or they can just lead to freezing job in some other cases */
if (WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_ANY)) { if (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY)) {
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
@ -182,9 +185,9 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
} }
else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) { else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) {
if (step == 1) if (step == 1)
PE_undo(CTX_data_scene(C)); PE_undo(scene);
else else
PE_redo(CTX_data_scene(C)); PE_redo(scene);
} }
else if (U.uiflag & USER_GLOBALUNDO) { else if (U.uiflag & USER_GLOBALUNDO) {
// note python defines not valid here anymore. // note python defines not valid here anymore.
@ -203,12 +206,18 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
else else
BKE_undo_step(C, step); BKE_undo_step(C, step);
WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, CTX_data_scene(C)); scene = CTX_data_scene(C);
WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
} }
} }
WM_event_add_notifier(C, NC_WINDOW, NULL); WM_event_add_notifier(C, NC_WINDOW, NULL);
if (win) {
win->addmousemove = true;
}
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }