1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 20:46:03 +08:00

Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

This commit is contained in:
Scott Ehlert
2011-04-28 01:29:22 -05:00
parent 88dd2ac536
commit 7f4855ae1f
265 changed files with 904 additions and 945 deletions

View File

@ -453,7 +453,7 @@ void StudioModel::SetUpBones( bool mergeBones )
{
if (m_Layer[i].m_weight > 0)
{
iMaxPriority = max( m_Layer[i].m_priority, iMaxPriority );
iMaxPriority = MAX( m_Layer[i].m_priority, iMaxPriority );
}
}