diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 09:35:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 09:35:42 +0300 |
commit | a0eb54142f244641041b0cb317cd09171105ad72 (patch) | |
tree | bf730ea540d2b44ffdb9c29cb4d379eb295737ee /source/blender/editors/sculpt_paint/paint_image_undo.c | |
parent | 31f2a6755db5bf9439e51701eddcadfca773459a (diff) |
Undo: replace global access w/ ED_undo_stack_get
While I'd like to avoid using this too much since the operator
system should handle.
It's less trouble than accessing it inline each time.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_undo.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_undo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_undo.c b/source/blender/editors/sculpt_paint/paint_image_undo.c index 9d1987943a5..554ddf92150 100644 --- a/source/blender/editors/sculpt_paint/paint_image_undo.c +++ b/source/blender/editors/sculpt_paint/paint_image_undo.c @@ -41,10 +41,10 @@ #include "BKE_depsgraph.h" #include "BKE_image.h" #include "BKE_main.h" -#include "BKE_global.h" #include "BKE_undo_system.h" #include "ED_paint.h" +#include "ED_undo.h" #include "GPU_draw.h" @@ -358,15 +358,15 @@ static void image_undo_free_list(ListBase *lb) void ED_image_undo_push_begin(const char *name) { + UndoStack *ustack = ED_undo_stack_get(); bContext *C = NULL; /* special case, we never read from this. */ - wmWindowManager *wm = G.main->wm.first; - BKE_undosys_step_push_init_with_type(wm->undo_stack, C, name, BKE_UNDOSYS_TYPE_IMAGE); + BKE_undosys_step_push_init_with_type(ustack, C, name, BKE_UNDOSYS_TYPE_IMAGE); } void ED_image_undo_push_end(void) { - wmWindowManager *wm = G.main->wm.first; /* XXX, avoids adding extra arg. */ - BKE_undosys_step_push(wm->undo_stack, NULL, NULL); + UndoStack *ustack = ED_undo_stack_get(); + BKE_undosys_step_push(ustack, NULL, NULL); } static void image_undo_invalidate(void) @@ -486,8 +486,8 @@ ListBase *ED_image_undosys_step_get_tiles(UndoStep *us_p) ListBase *ED_image_undo_get_tiles(void) { - wmWindowManager *wm = G.main->wm.first; /* XXX, avoids adding extra arg. */ - UndoStep *us = BKE_undosys_stack_init_or_active_with_type(wm->undo_stack, BKE_UNDOSYS_TYPE_IMAGE); + UndoStack *ustack = ED_undo_stack_get(); + UndoStep *us = BKE_undosys_stack_init_or_active_with_type(ustack, BKE_UNDOSYS_TYPE_IMAGE); return ED_image_undosys_step_get_tiles(us); } |