diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-09-23 00:47:57 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-09-23 00:47:57 -0500 |
| commit | bab91494d53f15d804834ba5d11730b0e855ebd8 (patch) | |
| tree | a86cd67ea34aa3497955dceb501794275e4e7f04 /Source/Core/DolphinWX/Src/Android/ButtonManager.cpp | |
| parent | d84312c799816e8835e6bed562f216bf19725761 (diff) | |
| parent | 1da6469c62fa1b4fd669a48cb583e161d5cb2713 (diff) | |
Merge branch 'master' into android-core-control
Diffstat (limited to 'Source/Core/DolphinWX/Src/Android/ButtonManager.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Android/ButtonManager.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp index 15cc371126..d3aa1c2a93 100644 --- a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp @@ -181,13 +181,7 @@ namespace ButtonManager void DrawButtons() { - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it) - DrawButton((*it)->GetTexture(), (*it)->GetCoords()); - - glDisable(GL_BLEND); + // XXX: Make platform specific drawing } // InputDevice |