summaryrefslogtreecommitdiff
path: root/src/normalopenglgraphics.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-09-26 01:57:54 +0300
committerAndrei Karas <akaras@inbox.ru>2012-09-30 02:57:14 +0300
commit29ad6702ab90fc75fe9d0422609609fd15123fc3 (patch)
tree0b9cee6f48b0dd28455e5ef86800efc30f38064d /src/normalopenglgraphics.cpp
parent660dcd09eb2c156e3ca8bafe0c1a339041204d33 (diff)
downloadmanaverse-29ad6702ab90fc75fe9d0422609609fd15123fc3.tar.gz
manaverse-29ad6702ab90fc75fe9d0422609609fd15123fc3.tar.bz2
manaverse-29ad6702ab90fc75fe9d0422609609fd15123fc3.tar.xz
manaverse-29ad6702ab90fc75fe9d0422609609fd15123fc3.zip
Some error fixes in atlases.
Check if image already in cache and check for mapinfo before using it.
Diffstat (limited to 'src/normalopenglgraphics.cpp')
-rw-r--r--src/normalopenglgraphics.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/normalopenglgraphics.cpp b/src/normalopenglgraphics.cpp
index 86cc70cea..4f3fd2aa2 100644
--- a/src/normalopenglgraphics.cpp
+++ b/src/normalopenglgraphics.cpp
@@ -1358,7 +1358,7 @@ void NormalOpenGLGraphics::debugBindTexture(const Image *image)
const std::string texture = image->getIdPath();
if (mOldTexture != texture)
{
- if (!mOldTexture.empty() && !texture.empty()
+ if ((!mOldTexture.empty() || !texture.empty())
&& mOldTextureId != image->mGLImage)
{
logger->log("bind: %s (%d) to %s (%d)", mOldTexture.c_str(),