Update models_obj.cpp

ZDoom · Mar 6, 2021 · d1ea33a · d1ea33a
1 parent 27cf152
commit d1ea33a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/common/models/models_obj.cpp b/src/common/models/models_obj.cpp
@@ -636,7 +636,7 @@ void FOBJModel::RenderFrame(FModelRenderer *renderer, FGameTexture * skin, int f
 		OBJSurface *surf = &surfaces[i];
 
 		FGameTexture *userSkin = skin;
-		if (!userSkin)
+		if (!userSkin && curSpriteMDLFrame)
 		{
 			int ssIndex = i + curMDLIndex * MD3_MAX_SURFACES;
 			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++)
 	{
 		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.
 			// On OBJs with lots of skins, such as Doom map OBJs exported from GZDB,