summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-26 00:43:20 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-26 00:48:50 +0300
commit916dfcf76e6ffa46cd61656e2c0087be4624cf80 (patch)
tree9b6770fa309111dfc70971fbbe7f7f23016aa577
parent852f665995d0f8b18eef61f6eee9fb39bd78df53 (diff)
downloadmv-916dfcf76e6ffa46cd61656e2c0087be4624cf80.tar.gz
mv-916dfcf76e6ffa46cd61656e2c0087be4624cf80.tar.bz2
mv-916dfcf76e6ffa46cd61656e2c0087be4624cf80.tar.xz
mv-916dfcf76e6ffa46cd61656e2c0087be4624cf80.zip
Dont add images from "all" atlas into empty atlas (with fake images).
This fixing some performance issues if enabled texture atlases but for current map atlas is missing.
-rw-r--r--src/resources/db/mapdb.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp
index 14c10b3b8..d991e8273 100644
--- a/src/resources/db/mapdb.cpp
+++ b/src/resources/db/mapdb.cpp
@@ -136,7 +136,7 @@ void MapDB::readAtlas(XmlNodePtrConst node)
mAtlases[atlas].push_back(file);
}
}
- if (atlas != "all")
+ if (atlas != "all" && atlas != paths.getStringValue("emptyAtlasName"))
{
const AtlasCIter &allAtlas = mAtlases.find("all");
if (allAtlas != mAtlases.end())