Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 20:16:10 +08:00
Code Activity

Fix conflicts with std::min/max.

Browse Source
This commit is contained in:
David Anderson
2020-05-18 17:46:25 -07:00
parent 46713a22a0
commit c33f7155e9
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/studio.h
View File

@ -1771,7 +1771,7 @@ struct thinModelVertices_t
{
Assert( ( m_numBoneInfluences >= 1 ) && ( m_numBoneInfluences <= 3 ) );
Assert( ( boneWeights.numbones >= 1 ) && ( boneWeights.numbones <= m_numBoneInfluences ) );
int numStoredWeights = max( 0, ( m_numBoneInfluences - 1 ) );
int numStoredWeights = V_max( 0, ( m_numBoneInfluences - 1 ) );
float *pBaseWeight = m_boneWeights + vertIndex*numStoredWeights;
char *pBaseIndex = m_boneIndices + vertIndex*m_numBoneInfluences;
for ( int i = 0; i < m_numBoneInfluences; i++ )
@ -1841,7 +1841,7 @@ private:
Assert( pBoneWeights );
Assert( ( m_numBoneInfluences <= 1 ) || ( m_boneWeights != NULL ) );
Assert( ( m_numBoneInfluences <= 0 ) || ( m_boneIndices != NULL ) );
int numStoredWeights = max( 0, ( m_numBoneInfluences - 1 ) );
int numStoredWeights = V_max( 0, ( m_numBoneInfluences - 1 ) );
float *pBaseWeight = m_boneWeights + vertIndex*numStoredWeights;
char *pBaseIndex = m_boneIndices + vertIndex*m_numBoneInfluences;
float sum = 0.0f;