game/client/c_baseentity.cpp

@@ -4320,13 +4320,12 @@ void C_BaseEntity::CalcAbsolutePosition( )
 		return;
 	}
 
-	// TODO_ENHANCED: this should be safe to remove.
-	// Not safe to remove this breaks C4 HUD.
-	if ( IsEffectActive(EF_BONEMERGE) )
-	{
-		MoveToAimEnt();
-		return;
-	}
+    // TODO_ENHANCED: this should be safe to remove.
+	// if ( IsEffectActive(EF_BONEMERGE) )
+	// {
+	// 	MoveToAimEnt();
+	// 	return;
+	// }
 
 	// Construct the entity-to-world matrix
 	// Start with making an entity-to-parent matrix

gamedata

@@ -1 +1 @@
-Subproject commit e5ac8b9a1438977b6998b558f6eb178bd044994c
+Subproject commit 3b8489243f2611c868dad64b1bbbabd3f32aa874

materialsystem/shaderapidx9/vertexshaderdx8.cpp

@@ -2058,7 +2058,7 @@ bool CShaderManager::LoadAndCreateShaders_Dynamic( ShaderLookup_t &lookup, bool
 //-----------------------------------------------------------------------------
 FileHandle_t CShaderManager::OpenFileAndLoadHeader( const char *pFileName, ShaderHeader_t *pHeader )
 {
-	FileHandle_t fp = g_pFullFileSystem->Open( pFileName, "rb" );
+	FileHandle_t fp = g_pFullFileSystem->Open( pFileName, "rb", "MOD" );
 	if ( fp == FILESYSTEM_INVALID_HANDLE )
 	{
 		return FILESYSTEM_INVALID_HANDLE;