Merge remote-tracking branch 'upstream/master'

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

3 files changed, 19 insertions, 3 deletions

diff --git a/mp/src/game/client/hl2/hud_autoaim.cpp b/mp/src/game/client/hl2/hud_autoaim.cpp
index 3339a72f..aa808acf 100644
--- a/mp/src/game/client/hl2/hud_autoaim.cpp
+++ b/mp/src/game/client/hl2/hud_autoaim.cpp
@@ -146,6 +146,7 @@ void CHUDAutoAim::VidInit( void )
 //-----------------------------------------------------------------------------
 bool CHUDAutoAim::ShouldDraw( void )
 {	
+#ifndef HL1_CLIENT_DLL
 	C_BaseHLPlayer *pLocalPlayer = (C_BaseHLPlayer *)C_BasePlayer::GetLocalPlayer();
 	if ( pLocalPlayer )
 	{
@@ -154,6 +155,7 @@ bool CHUDAutoAim::ShouldDraw( void )
 			return false;
 		}
 	}
+#endif
 
 	return ( (hud_draw_fixed_reticle.GetBool() || hud_draw_active_reticle.GetBool()) && CHudElement::ShouldDraw() && !engine->IsDrawingLoadingImage() );
 }
diff --git a/mp/src/game/client/hl2/hud_damageindicator.cpp b/mp/src/game/client/hl2/hud_damageindicator.cpp
index 86debdf7..48dd9b62 100644
--- a/mp/src/game/client/hl2/hud_damageindicator.cpp
+++ b/mp/src/game/client/hl2/hud_damageindicator.cpp
@@ -20,7 +20,7 @@
 #include "IEffects.h"
 #include "hudelement.h"
 #include "clienteffectprecachesystem.h"
-#include "headtrack/isourcevirtualreality.h"
+#include "sourcevr/isourcevirtualreality.h"
 
 using namespace vgui;
 
diff --git a/mp/src/game/client/hl2/hud_weaponselection.cpp b/mp/src/game/client/hl2/hud_weaponselection.cpp
index 3d857e99..9d223169 100644
--- a/mp/src/game/client/hl2/hud_weaponselection.cpp
+++ b/mp/src/game/client/hl2/hud_weaponselection.cpp
@@ -451,6 +451,17 @@ void CHudWeaponSelection::Paint()
 	if ( !pSelectedWeapon )
 		return;
 
+	bool bPushedViewport = false;
+	if( hud_fastswitch.GetInt() == HUDTYPE_FASTSWITCH  || hud_fastswitch.GetInt() == HUDTYPE_PLUS )
+	{
+		CMatRenderContextPtr pRenderContext( materials );
+		if( pRenderContext->GetRenderTarget() )
+		{
+			surface()->PushFullscreenViewport();
+			bPushedViewport = true;
+		}
+	}
+
 	// interpolate the selected box size between the small box size and the large box size
 	// interpolation has been removed since there is no weapon pickup animation anymore, so it's all at the largest size
 	float percentageDone = 1.0f; //min(1.0f, (gpGlobals->curtime - m_flPickupStartTime) / m_flWeaponPickupGrowTime);
@@ -727,6 +738,11 @@ void CHudWeaponSelection::Paint()
 		}
 		break;
 	}
+
+	if( bPushedViewport )
+	{
+		surface()->PopFullscreenViewport();
+	}
 }
 
 
@@ -1025,8 +1041,6 @@ void CHudWeaponSelection::ApplySchemeSettings(vgui::IScheme *pScheme)
 	{
 		SetBounds( x, y, screenWide - x, screenTall - y );
 	}
-
-	SetForceStereoRenderToFrameBuffer( true );
 }
 
 //-----------------------------------------------------------------------------