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/util | |
| parent | ca2be6912d7dd8b6770a2c00e62d33c7653c21c2 (diff) | |
| parent | da9b1b14ed0ffd29fcff8f4ca64fff5f034532fc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/util')
| -rw-r--r-- | source/blender/editors/util/ed_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index a829f8c1144..549b9b7de77 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -145,8 +145,8 @@ void ED_editors_exit(bContext *C) return; /* frees all editmode undos */ - if (G.main->wm.first) { - wmWindowManager *wm = G.main->wm.first; + if (G_MAIN->wm.first) { + wmWindowManager *wm = G_MAIN->wm.first; /* normally we don't check for NULL undo stack, do here since it may run in different context. */ if (wm->undo_stack) { BKE_undosys_stack_destroy(wm->undo_stack); |