diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:25:41 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:25:41 +0300 |
commit | 5b6ae0523e18fbc94ba523e20f6c783cb8b3aa89 (patch) | |
tree | 478091477aea6fc67186cfcf2ddcd17a214b1366 /source/blender/editors/undo | |
parent | ca2be6912d7dd8b6770a2c00e62d33c7653c21c2 (diff) | |
parent | da9b1b14ed0ffd29fcff8f4ca64fff5f034532fc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/undo')
-rw-r--r-- | source/blender/editors/undo/ed_undo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index a28e24bc0f7..c4bfe83ed4c 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -205,7 +205,7 @@ bool ED_undo_is_valid(const bContext *C, const char *undoname) */ UndoStack *ED_undo_stack_get(void) { - wmWindowManager *wm = G.main->wm.first; + wmWindowManager *wm = G_MAIN->wm.first; return wm->undo_stack; } |