zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-03-17 07:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
nashmuhandes 2016-05-11 13:29:49 +08:00
commit 89d25e23f1
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl/textures/gl_hwtexture.cpp
View file

@ -315,13 +315,13 @@ void FHardwareTexture::Clean(bool all)
void FHardwareTexture::CleanUnused(SpriteHits &usedtranslations)
{
if (usedtranslations.CheckKey(0) != nullptr)
if (usedtranslations.CheckKey(0) == nullptr)
{
glDefTex.Delete();
}
for (int i = glTex_Translated.Size()-1; i>= 0; i--)
{
if (usedtranslations.CheckKey(glTex_Translated[i].translation) != nullptr)
if (usedtranslations.CheckKey(glTex_Translated[i].translation) == nullptr)
{
glTex_Translated[i].Delete();
glTex_Translated.Delete(i);

1
src/posix/cocoa/i_video.mm
View file

@ -1284,6 +1284,7 @@ void BoundTextureDraw2D(const GLsizei width, const GLsizei height)
vbo->RenderCurrent(ptr, GL_TRIANGLE_STRIP);
gl_RenderState.SetEffect(EFF_NONE);
gl_RenderState.SetTextureMode(TM_MODULATE);
}
bool BoundTextureSaveAsPNG(const GLenum target, const char* const path)