zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed crash during autoloading of material textures

Browse source 
https://forum.zdoom.org/viewtopic.php?t=60546
This commit is contained in:
alexey.lysiuk 2018-05-10 18:01:29 +03:00
parent a7e7db1fe9
commit 2c2b19bb7f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/textures/texturemanager.cpp
View file

@ -1050,9 +1050,12 @@ void FTextureManager::Init()
InitPalettedVersions(); InitPalettedVersions();
AdjustSpriteOffsets(); AdjustSpriteOffsets();
// Add auto materials to each texture after everything has been set up. // Add auto materials to each texture after everything has been set up.
for (auto &tex : Textures) // Textures array can be reallocated in process, so ranged for loop is not suitable.
// There is no need to process discovered material textures here,
// CheckForTexture() did this already.
for (unsigned int i = 0, count = Textures.Size(); i < count; ++i)
{ {
tex.Texture->AddAutoMaterials(); Textures[i].Texture->AddAutoMaterials();
} }
glLight = TexMan.CheckForTexture("glstuff/gllight.png", ETextureType::MiscPatch); glLight = TexMan.CheckForTexture("glstuff/gllight.png", ETextureType::MiscPatch);