Fix a last check, and remove the conflict between damage splashes and damage blur...

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 41dd51d1a152b27341da4dd13afb645420b5cbc2..afc53901b2c6c3f0e1da5925245597031a8b7bd1 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -871,13 +871,15 @@ void CSQC_UpdateView(float w, float h)
                }
        }
 
-       if not(autocvar_hud_damage && autocvar_hud_postprocessing)
+       if(autocvar_hud_postprocessing && !autocvar_hud_postprocessing_maxbluralpha)
+       if(cvar("r_glsl_postprocess_uservec1_enable"))
        {
                // don't allow blur to get stuck on if we disable the cvar while damaged
                cvar_set("r_glsl_postprocess_uservec1", "0 0 0 0");
                cvar_set("r_glsl_postprocess_uservec1_enable", "0");
        }
-       if not(autocvar_hud_powerup && autocvar_hud_postprocessing)
+       if(autocvar_hud_postprocessing && !autocvar_hud_powerup)
+       if(cvar("r_glsl_postprocess_uservec2_enable"))
        {
                // don't allow sharpen to get stuck on if we disable the cvar while powered up
                cvar_set("r_glsl_postprocess_uservec2", "0 0 0 0");