From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 23 Jun 2011 11:59:26 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing
X-Git-Tag: xonotic-v0.5.0~173^2~3^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=36f4b513fd7eac9b2dc37d393cebf3b7d98ac9af;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/hud_postprocessing
---

36f4b513fd7eac9b2dc37d393cebf3b7d98ac9af
diff --cc qcsrc/client/View.qc
index 8a862f5d7,870da0d7b..1dfa1b359
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -766,28 -754,12 +759,28 @@@ void CSQC_UpdateView(float w, float h
  		}
  		else
  			contentfadetime = autocvar_hud_contents_fadeouttime;
- 			
+ 
  		contentalpha_temp = bound(0, drawframetime / max(0.0001, contentfadetime), 1);
  		contentavgalpha = contentavgalpha * (1 - contentalpha_temp) + incontent * contentalpha_temp;
- 		
+ 
  		if(contentavgalpha)
  			drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL);
 +
 +		if(autocvar_hud_postprocessing)
 +		{
 +			if(autocvar_hud_contents_blur && contentavgalpha)
 +			{
 +				content_blurpostprocess_x = 1;
 +				content_blurpostprocess_y = contentavgalpha * autocvar_hud_contents_blur;
 +				content_blurpostprocess_z = contentavgalpha * autocvar_hud_contents_blur_alpha;
 +			}
 +			else
 +			{
 +				content_blurpostprocess_x = 0;
 +				content_blurpostprocess_y = 0;
 +				content_blurpostprocess_z = 0;
 +			}
 +		}
  	}
  	
  	if(autocvar_hud_damage && !autocvar_chase_active)