Merge branch 'master' into TemporaryHackishBranch

# Conflicts:
#	GPU/Directx9/PixelShaderGeneratorDX9.cpp
#	GPU/Directx9/VertexShaderGeneratorDX9.cpp
#	GPU/GLES/FragmentShaderGeneratorGLES.cpp
#	GPU/GLES/VertexShaderGeneratorGLES.cpp
#	GPU/Vulkan/FragmentShaderGeneratorVulkan.cpp
#	Windows/GEDebugger/GEDebugger.h
This commit is contained in:
LunaMoo committed 2020-11-23 04:09:34 +01:00
commit 0779db5935
257 files changed
+7754 -7633

No files matched your search

+4
View File
@@ -1010,6 +1010,10 @@ namespace MainWindow
InputDevice::BeginPolling();
break;
case WM_USER_SWITCHUMD_UPDATED:
UpdateSwitchUMD();
break;
case WM_MENUSELECT:
// Called when a menu is opened. Also when an item is selected, but meh.
UpdateMenus(true);