[Bf-blender-cvs] [50558416b93] master: Commented assumption was incorrect, using tickCountToMillis causes underflow when compared to current time.

Nicholas Rishel noreply at git.blender.org
Sat Oct 31 00:32:30 CET 2020


Commit: 50558416b93b5bb83a62f2f9b25a5bc6bf328d98
Author: Nicholas Rishel
Date:   Thu Oct 22 17:50:51 2020 -0700
Branches: master
https://developer.blender.org/rB50558416b93b5bb83a62f2f9b25a5bc6bf328d98

Commented assumption was incorrect, using tickCountToMillis causes underflow when compared to current time.

===================================================================

M	intern/ghost/intern/GHOST_WindowWin32.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index d9b5a9f8b65..381b1198f7e 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -1382,8 +1382,7 @@ GHOST_TSuccess GHOST_WindowWin32::getWintabInfo(std::vector<GHOST_WintabInfoWin3
 
     m_wintab.sysButtonsPressed = pkt.pkButtons;
 
-    /* Wintab does not support performance counters, so use low frequency counter instead. */
-    outWintabInfo[i].time = system->tickCountToMillis(pkt.pkTime);
+    outWintabInfo[i].time = system->millisSinceStart(pkt.pkTime);
     outWintabInfo[i].tabletData = tabletData;
   }



More information about the Bf-blender-cvs mailing list