zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 05:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update models_obj.cpp

Browse source
This commit is contained in:
Chernoskill 2021-03-06 11:27:23 +01:00 committed by GitHub
parent 27cf152438
commit d1ea33a815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/models/models_obj.cpp
View file

@ -636,7 +636,7 @@ void FOBJModel::RenderFrame(FModelRenderer *renderer, FGameTexture * skin, int f
OBJSurface *surf = &surfaces[i]; OBJSurface *surf = &surfaces[i];
FGameTexture *userSkin = skin; FGameTexture *userSkin = skin;
if (!userSkin) if (!userSkin && curSpriteMDLFrame)
{ {
int ssIndex = i + curMDLIndex * MD3_MAX_SURFACES; int ssIndex = i + curMDLIndex * MD3_MAX_SURFACES;
if (i < MD3_MAX_SURFACES && curSpriteMDLFrame->surfaceskinIDs[ssIndex].isValid()) if (i < MD3_MAX_SURFACES && curSpriteMDLFrame->surfaceskinIDs[ssIndex].isValid())
@ -671,7 +671,7 @@ void FOBJModel::AddSkins(uint8_t* hitlist)
for (size_t i = 0; i < surfaces.Size(); i++) for (size_t i = 0; i < surfaces.Size(); i++)
{ {
size_t ssIndex = i + curMDLIndex * MD3_MAX_SURFACES; size_t ssIndex = i + curMDLIndex * MD3_MAX_SURFACES;
if (i < MD3_MAX_SURFACES && curSpriteMDLFrame->surfaceskinIDs[ssIndex].isValid()) if (curSpriteMDLFrame && i < MD3_MAX_SURFACES && curSpriteMDLFrame->surfaceskinIDs[ssIndex].isValid())
{ {
// Precache skins manually reassigned by the user. // Precache skins manually reassigned by the user.
// On OBJs with lots of skins, such as Doom map OBJs exported from GZDB, // On OBJs with lots of skins, such as Doom map OBJs exported from GZDB,