diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 13:39:52 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 13:39:52 +0300 |
commit | 4bf751be7012827758b5b2ae844e370028921bd2 (patch) | |
tree | 40102707050faa5742a7e435a7f3d68804fa53a1 /source/blender/windowmanager/intern/wm_cursors.c | |
parent | a671aa922a1591128f0a1478c29af39ff6eca61f (diff) | |
parent | 66407e15cb5136bdbed45b9e0576b1e9863c3f4f (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_normal_edit.c
source/blender/windowmanager/intern/wm_files.c
Diffstat (limited to 'source/blender/windowmanager/intern/wm_cursors.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index f13dac9cb4c..eaeaac45f89 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -194,7 +194,7 @@ void WM_cursor_modal_restore(wmWindow *win) void WM_cursor_wait(bool val) { if (!G.background) { - wmWindowManager *wm = G.main->wm.first; + wmWindowManager *wm = G_MAIN->wm.first; wmWindow *win = wm ? wm->windows.first : NULL; for (; win; win = win->next) { |