From 29ad6702ab90fc75fe9d0422609609fd15123fc3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 26 Sep 2012 01:57:54 +0300
Subject: Some error fixes in atlases.

Check if image already in cache and check for mapinfo before using it.
---
 src/normalopenglgraphics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/normalopenglgraphics.cpp')

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(),
-- 
cgit v1.2.3-60-g2f50