Merge branch 'master' into soc-2019-openxr
authorJulian Eisel <eiseljulian@gmail.com>
Mon, 8 Jul 2019 12:18:08 +0000 (14:18 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Mon, 8 Jul 2019 12:18:08 +0000 (14:18 +0200)
1  2 
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/space_topbar.py
source/blender/blenloader/intern/readfile.c
source/blender/draw/intern/draw_manager.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_draw.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c

Simple merge
Simple merge
index 0400310db5dd23fddff0647772e42569a7a424f4,fc669c9543e0999e3b08073e2db3a8aa1dfd5b9b..8e15eb71395a2466309f003cc001f3c2ac064e5c
@@@ -979,12 -932,9 +1018,9 @@@ void wm_draw_update(bContext *C
        ED_screen_ensure_updated(wm, win, screen);
  
        wm_draw_window(C, win);
-       screen->do_draw_gesture = false;
-       screen->do_draw_paintcursor = false;
-       screen->do_draw_drag = false;
+       wm_draw_update_clear_window(win);
  
 -      wm_window_swap_buffers(win);
 +      wm_window_present(win);
  
        CTX_wm_window_set(C, NULL);
      }