diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-04-27 22:01:24 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-04-27 22:01:24 +0300 |
commit | 15081cf6df70f01a6137134f370e1fb67f515ab9 (patch) | |
tree | 42c25d59698e263777bfa52aa26620a696da1715 /intern | |
parent | ea757015295338397bf17bd76f949719bae9d954 (diff) | |
parent | 7951ec264114c688df5d4204b65b77ac7889d819 (diff) |
Merge remote-tracking branch 'origin/blender-v2.83-release'
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index b0ba7b6befb..8b95cdd6351 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -72,6 +72,7 @@ GHOST_WindowWin32::GHOST_WindowWin32(GHOST_SystemWin32 *system, bool is_debug, bool dialog) : GHOST_Window(width, height, state, wantStereoVisual, false), + m_tabletInRange(false), m_inLiveResize(false), m_system(system), m_hDC(0), @@ -86,8 +87,7 @@ GHOST_WindowWin32::GHOST_WindowWin32(GHOST_SystemWin32 *system, m_fpGetPointerPenInfoHistory(NULL), m_fpGetPointerTouchInfoHistory(NULL), m_parentWindowHwnd(parentwindow ? parentwindow->m_hWnd : NULL), - m_debug_context(is_debug), - m_tabletInRange(false) + m_debug_context(is_debug) { // Initialize tablet variables memset(&m_wintab, 0, sizeof(m_wintab)); |