Skip to content

Commit e392686

Browse files
authored
Merge pull request #230 from SanyaSho/patch/null-sprite-crash
Add missing NULL check from original MP branch
2 parents f3b17b7 + d23ae89 commit e392686

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

game/client/spritemodel.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,9 @@ IMaterial *CEngineSprite::GetMaterial( RenderMode_t nRenderMode, int nFrame )
417417

418418

419419
IMaterial *pMaterial = m_material[nRenderMode];
420+
if( !pMaterial )
421+
return NULL;
422+
420423
IMaterialVar* pFrameVar = pMaterial->FindVarFast( "$frame", &frameCache );
421424
if ( pFrameVar )
422425
{
@@ -539,4 +542,4 @@ void CEngineSprite::DrawFrameOfSize( RenderMode_t nRenderMode, int frame, int x,
539542

540543
meshBuilder.End();
541544
pMesh->Draw();
542-
}
545+
}

0 commit comments

Comments
 (0)