diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-01-25 22:27:17 +0100 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-01-25 22:27:17 +0100 |
| commit | fc46d460f987fc718bc07add95c49c2425c50159 (patch) | |
| tree | 58b046de053ff3fee179583008e8a3e2f632d0b0 | |
| parent | 262c3b19ecf9a4c022b3667613f892a5539dd34d (diff) | |
VideoConfigDiag: Allow anaglyph shader to be turned off.
Also hard-code the default shader.
| -rw-r--r-- | Source/Core/DolphinWX/VideoConfigDiag.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/VideoConfigDiag.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 09d0aa9d1d..4e3ec0deb9 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -739,8 +739,7 @@ void VideoConfigDiag::PopulatePostProcessingShaders() if (shaders.empty()) return; - if (vconfig.iStereoMode != STEREO_ANAGLYPH) - choice_ppshader->AppendString(_("(off)")); + choice_ppshader->AppendString(_("(off)")); for (const std::string& shader : shaders) { @@ -753,7 +752,10 @@ void VideoConfigDiag::PopulatePostProcessingShaders() choice_ppshader->Select(0); if (vconfig.iStereoMode == STEREO_ANAGLYPH) - vconfig.sPostProcessingShader = shaders[0]; + { + vconfig.sPostProcessingShader = "dubois"; + choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader)); + } else vconfig.sPostProcessingShader.clear(); } diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h index 10eb8c0385..4d2d98adaa 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -144,7 +144,7 @@ protected: void Event_PPShader(wxCommandEvent &ev) { const int sel = ev.GetInt(); - if (sel || vconfig.iStereoMode == STEREO_ANAGLYPH) + if (sel) vconfig.sPostProcessingShader = WxStrToStr(ev.GetString()); else vconfig.sPostProcessingShader.clear(); |
