From 954f21f71d4426c6680dfb82b9b1ba7512b025c4 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <eruanna@drdteam.org>
Date: Tue, 14 Mar 2017 18:46:51 -0400
Subject: [PATCH] - changed defaults - moved CVARs to head of file as forward
 declaration - FGLRenderer::BlurScene now checks if postprocessing is enabled
 before executing

---
 src/gl/renderer/gl_postprocess.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/gl/renderer/gl_postprocess.cpp b/src/gl/renderer/gl_postprocess.cpp
index 77edfe0c9..cc1092ccc 100644
--- a/src/gl/renderer/gl_postprocess.cpp
+++ b/src/gl/renderer/gl_postprocess.cpp
@@ -145,6 +145,8 @@ CUSTOM_CVAR(Bool, gl_paltonemap_reverselookup, true, CVAR_ARCHIVE | CVAR_NOINITC
 		GLRenderer->ClearTonemapPalette();
 }
 
+CVAR(Float, gl_menu_blur, 1.0f, CVAR_ARCHIVE)
+CVAR(Bool, gl_menu_blur_enabled, true, CVAR_ARCHIVE)
 
 EXTERN_CVAR(Float, vid_brightness)
 EXTERN_CVAR(Float, vid_contrast)
@@ -166,7 +168,6 @@ void FGLRenderer::PostProcessScene(int fixedcm)
 	ColormapScene(fixedcm);
 	LensDistortScene();
 	ApplyFXAA();
-	//BlurScene();
 }
 
 //-----------------------------------------------------------------------------
@@ -474,19 +475,17 @@ void FGLRenderer::BloomScene(int fixedcm)
 //
 //-----------------------------------------------------------------------------
 
-CVAR(Float, gl_menu_blur, 5.0f, CVAR_ARCHIVE)
-CVAR(Bool, gl_menu_blur_enabled, false, CVAR_ARCHIVE)
-
 void FGLRenderer::BlurScene()
 {
-	if ((!gl_menu_blur_enabled) || (gl_menu_blur <= 0.0))
+	float blurAmount = gl_menu_blur;
+	if ((!gl_menu_blur_enabled) || (gl_menu_blur <= 0.0) || !FGLRenderBuffers::IsEnabled())
 		return;
+
 	FGLDebug::PushGroup("BlurScene");
 
 	FGLPostProcessState savedState;
 	savedState.SaveTextureBindings(2);
 
-	const float blurAmount = gl_menu_blur;
 	int sampleCount = 9;
 	int numLevels = 3; // Must be 4 or less (since FGLRenderBuffers::NumBloomLevels is 4 and we are using its buffers).
 	assert(numLevels <= FGLRenderBuffers::NumBloomLevels);