Merge branch 'master' into libuv010

2014-09-09 17:06:22 -04:00
parent 74c4f976d1 2a50fccd24
commit c32bb85248
72 changed files with 950 additions and 1253 deletions
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -545,10 +545,6 @@ void Map::render() {
 #if defined(DEBUG)
    std::vector<std::string> debug;
 #endif
-
-    glyphAtlas->upload();
-    spriteAtlas->upload();
-
    painter.clear();

    painter.resize();