VideoConfigDiag: Allow anaglyph shader to be turned off.

Also hard-code the default shader.
karolherbst · Jan 25, 2015 · fc46d46 · fc46d46
1 parent 262c3b1
commit fc46d46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -144,7 +144,7 @@ class VideoConfigDiag : public wxDialog
 	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();