summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-16 21:10:58 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-16 21:27:20 +0300
commit71a8401df046ac856d3bb02d6f44733890883f44 (patch)
treee37e6c9b47ff4a9c45a41860286a78bd12f61616 /src/resources
parenta82331f46657298d335c36f9276ab3007b327d4b (diff)
downloadmv-71a8401df046ac856d3bb02d6f44733890883f44.tar.gz
mv-71a8401df046ac856d3bb02d6f44733890883f44.tar.bz2
mv-71a8401df046ac856d3bb02d6f44733890883f44.tar.xz
mv-71a8401df046ac856d3bb02d6f44733890883f44.zip
Add max texture size detection for all modes.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/atlasmanager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp
index cdbd26a65..c78c9911f 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlasmanager.cpp
@@ -25,6 +25,7 @@
#include "resources/atlasmanager.h"
#include "configuration.h"
+#include "settings.h"
#ifdef DEBUG_IMAGES
#include "logger.h"
@@ -61,7 +62,7 @@ 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");
+ int sz = settings.textureSize;
if (maxSize > sz)
maxSize = sz;
#endif