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

- fixed crash with particles checking a non-existent actor.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-18 22:20:15 +02:00
parent c836dd3dbf
commit 46e75e8107
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/textures/textures.h
View file

@ -374,7 +374,7 @@ public:
FImageTexture(FImageSource* image) noexcept; FImageTexture(FImageSource* image) noexcept;
virtual TArray<uint8_t> Get8BitPixels(bool alphatex); virtual TArray<uint8_t> Get8BitPixels(bool alphatex);
void SetImage(FImageSource* img) // This is only for the multipatch texture builder! void SetImage(FImageSource* img)
{ {
mImage = img; mImage = img;
SetFromImage(); SetFromImage();

2
src/rendering/hwrenderer/scene/hw_sprites.cpp
View file

@ -197,7 +197,7 @@ void HWSprite::DrawSprite(HWDrawInfo *di, FRenderState &state, bool translucent)
state.SetFog(0, 0); state.SetFog(0, 0);
} }
uint32_t spritetype = (actor->renderflags & RF_SPRITETYPEMASK); uint32_t spritetype = actor? uint32_t(actor->renderflags & RF_SPRITETYPEMASK) : 0;
if (texture) state.SetMaterial(texture, UF_Sprite, (spritetype == RF_FACESPRITE) ? CTF_Expand : 0, CLAMP_XY, translation, OverrideShader); if (texture) state.SetMaterial(texture, UF_Sprite, (spritetype == RF_FACESPRITE) ? CTF_Expand : 0, CLAMP_XY, translation, OverrideShader);
else if (!modelframe) state.EnableTexture(false); else if (!modelframe) state.EnableTexture(false);