Merge remote-tracking branch 'upstream/master'

Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.

1 files changed, 23 insertions, 23 deletions

diff --git a/mp/src/materialsystem/stdshaders/SDK_bloomadd_ps2x.fxc b/mp/src/materialsystem/stdshaders/SDK_bloomadd_ps2x.fxc
index 9faf9ecd..aa434b4e 100644
--- a/mp/src/materialsystem/stdshaders/SDK_bloomadd_ps2x.fxc
+++ b/mp/src/materialsystem/stdshaders/SDK_bloomadd_ps2x.fxc
@@ -1,23 +1,23 @@
-//======= Copyright � 1996-2006, Valve Corporation, All rights reserved. ======

-#define CONVERT_TO_SRGB 0

-

-#include "common_ps_fxc.h"

-

-sampler TexSampler	: register( s0 );

-

-struct PS_INPUT

-{

-	HALF2 baseTexCoord				: TEXCOORD0;		// Base texture coordinate

-	

-#if defined( _X360 ) //matching pixel shader inputs to vertex shader outputs to avoid shader patches	

-	float2 ZeroTexCoord				: TEXCOORD1;

-    float2 bloomTexCoord            : TEXCOORD2;

-#endif

-};

-

-float4 main( PS_INPUT i ) : COLOR

-{

-	float4 result = tex2D( TexSampler, i.baseTexCoord );

-	result.a = 1.0f;

-	return result; //FinalOutput( result, 0, PIXEL_FOG_TYPE_NONE, TONEMAP_SCALE_NONE );

-}

+//======= Copyright � 1996-2006, Valve Corporation, All rights reserved. ======
+#define CONVERT_TO_SRGB 0
+
+#include "common_ps_fxc.h"
+
+sampler TexSampler	: register( s0 );
+
+struct PS_INPUT
+{
+	HALF2 baseTexCoord				: TEXCOORD0;		// Base texture coordinate
+	
+#if defined( _X360 ) //matching pixel shader inputs to vertex shader outputs to avoid shader patches	
+	float2 ZeroTexCoord				: TEXCOORD1;
+    float2 bloomTexCoord            : TEXCOORD2;
+#endif
+};
+
+float4 main( PS_INPUT i ) : COLOR
+{
+	float4 result = tex2D( TexSampler, i.baseTexCoord );
+	result.a = 1.0f;
+	return result; //FinalOutput( result, 0, PIXEL_FOG_TYPE_NONE, TONEMAP_SCALE_NONE );
+}