Merge branch 'release/1.10.x'

panda/src/device/winRawInputDevice.cxx

@@ -15,6 +15,7 @@
 #include "gamepadButton.h"
 #include "mouseButton.h"
 #include "buttonRegistry.h"
+#include "winInputDeviceManager.h"
 
 #if defined(_WIN32) && !defined(CPPPARSER)
 

panda/src/glstuff/glShaderContext_src.cxx

@@ -2462,7 +2462,7 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) {
       }
 
       GLint p = bind._id._seqno;
-      max_p = max(max_p, p + 1);
+      max_p = max(max_p, p + bind._elements);
 
       // Don't apply vertex colors if they are disabled with a ColorAttrib.
       int num_elements, element_stride, divisor;

pandatool/src/win-stats/winStats.cxx

@@ -16,6 +16,9 @@
 #include "winStatsServer.h"
 #include "config_pstatclient.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 static const char *toplevel_class_name = "pstats";

pandatool/src/win-stats/winStatsChartMenu.h

@@ -16,6 +16,9 @@
 
 #include "pandatoolbase.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 class WinStatsMonitor;

pandatool/src/win-stats/winStatsGraph.h

@@ -18,6 +18,9 @@
 #include "winStatsLabelStack.h"
 #include "pmap.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 class WinStatsMonitor;

pandatool/src/win-stats/winStatsLabel.h

@@ -16,6 +16,9 @@
 
 #include "pandatoolbase.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 class WinStatsMonitor;

pandatool/src/win-stats/winStatsLabelStack.h

@@ -17,6 +17,9 @@
 #include "pandatoolbase.h"
 #include "pvector.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 class WinStatsLabel;

pandatool/src/win-stats/winStatsMonitor.h

@@ -23,6 +23,9 @@
 #include "pvector.h"
 #include "pmap.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 class WinStatsServer;

pandatool/src/win-stats/winStatsPianoRoll.h

@@ -20,6 +20,9 @@
 #include "pStatPianoRoll.h"
 #include "pointerTo.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 class WinStatsMonitor;

pandatool/src/win-stats/winStatsStripChart.h

@@ -20,6 +20,9 @@
 #include "pStatStripChart.h"
 #include "pointerTo.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 class WinStatsMonitor;