From e1cf1e16b924bce044f5d2114e3ed299d92afc6e Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Thu, 19 Dec 2019 21:41:01 +0000 Subject: [PATCH] Unbind the correct texture slot in SkyManager Wrong binding pair was introduced in 779a33ee30. Patch By: linkmauve Differential Revision: https://code.wildfiregames.com/D2487 This was SVN commit r23263. --- binaries/data/mods/public/gui/credits/texts/programming.json | 1 + source/renderer/SkyManager.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json index 097b0f352f..a305edf95c 100644 --- a/binaries/data/mods/public/gui/credits/texts/programming.json +++ b/binaries/data/mods/public/gui/credits/texts/programming.json @@ -136,6 +136,7 @@ {"nick": "lafferjm", "name": "Justin Lafferty"}, {"nick": "LeanderH", "name": "Leander Hemelhof"}, {"nick": "leper", "name": "Georg Kilzer"}, + {"nick": "Link Mauve", "name": "Emmanuel Gil Peyrot"}, {"nick": "LittleDev"}, {"nick": "livingaftermidnight", "name": "Will Dull"}, {"nick": "Louhike"}, diff --git a/source/renderer/SkyManager.cpp b/source/renderer/SkyManager.cpp index 285ea4f7a0..bd1220c1ee 100644 --- a/source/renderer/SkyManager.cpp +++ b/source/renderer/SkyManager.cpp @@ -143,7 +143,7 @@ void SkyManager::LoadSkyTextures() #else glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); #endif - glBindTexture(GL_TEXTURE_2D, 0); + glBindTexture(GL_TEXTURE_CUBE_MAP, 0); /////////////////////////////////////////////////////////////////////////// }