summaryrefslogtreecommitdiff
path: root/src/resources/atlasmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-25 21:26:30 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-25 21:26:30 +0300
commitbac47f0be5594afad8cf3a9fc23f416b9b710ea3 (patch)
tree3a8ae966be2e7ce08a6fff3f941d0be332d6e96b /src/resources/atlasmanager.cpp
parent840e969cadf36e17372da397eb758405150de6f8 (diff)
downloadmv-bac47f0be5594afad8cf3a9fc23f416b9b710ea3.tar.gz
mv-bac47f0be5594afad8cf3a9fc23f416b9b710ea3.tar.bz2
mv-bac47f0be5594afad8cf3a9fc23f416b9b710ea3.tar.xz
mv-bac47f0be5594afad8cf3a9fc23f416b9b710ea3.zip
Dont use detected texture size on Android and MacOSX.
Because here detection not implimented.
Diffstat (limited to 'src/resources/atlasmanager.cpp')
-rw-r--r--src/resources/atlasmanager.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp
index c60d6465d..e1dd05d2d 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlasmanager.cpp
@@ -56,9 +56,11 @@ AtlasResource *AtlasManager::loadTextureAtlas(const std::string &name,
loadImages(files, images);
int maxSize = OpenGLImageHelper::getTextureSize();
+#if !defined(ANDROID) && !defined(__APPLE__)
const int sz = config.getIntValue("textureSize");
if (maxSize > sz)
maxSize = sz;
+#endif
// sorting images on atlases.
simpleSort(name, atlases, images, maxSize);