Skip to content

[TF2] Fix attachments on dropped weapons having broken textures for certain war paints / skins #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Piogre wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TF2] Fix attachments on dropped weapons having broken textures for certain war paints / skins #1847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/game/shared/tf/tf_dropped_weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,16 @@ bool CTFDroppedWeapon::OnInternalDrawModel( ClientModelRenderInfo_t *pInfo )
if ( !BaseClass::OnInternalDrawModel( pInfo ) )
return false;

// This flag says we should turn off the material overrides for attachments.
IMaterial* pMaterialOverride = NULL;
OverrideType_t nMaterialOverrideType = OVERRIDE_NORMAL;

if ((pInfo->flags & STUDIO_NO_OVERRIDE_FOR_ATTACH) != 0)
{
modelrender->GetMaterialOverride(&pMaterialOverride, &nMaterialOverrideType);
modelrender->ForcedMaterialOverride(NULL, nMaterialOverrideType);
}

// Draw Attached Models
// Draw our attached models as well
for ( int i = 0; i < m_vecAttachedModels.Size(); i++ )
Expand Down Expand Up @@ -313,6 +323,9 @@ bool CTFDroppedWeapon::OnInternalDrawModel( ClientModelRenderInfo_t *pInfo )
}
}

if (pMaterialOverride != NULL)
modelrender->ForcedMaterialOverride(pMaterialOverride, nMaterialOverrideType);

return true;
}
//-----------------------------------------------------------------------------
Expand Down