Merge branch 'master' into perspective-without-y-flip

2015-08-25 14:13:16 -07:00
parent 36d71c95dc 765c4695d8
commit 0e456940b9
9 changed files with 41 additions and 35 deletions
--- a/src/mbgl/map/source.cpp
+++ b/src/mbgl/map/source.cpp
@@ -530,14 +530,9 @@ void Source::invalidateTiles(const std::unordered_set<TileID, TileID::Hash>& ids
 }

 void Source::updateTilePtrs() {
-    std::vector<Tile*> newPtrs;
+    tilePtrs.clear();
    for (const auto& pair : tiles) {
-        newPtrs.push_back(pair.second.get());
-    }
-
-    if (tilePtrs != newPtrs) {
-        tilePtrs = newPtrs;
-        emitTileLoaded(true);
+        tilePtrs.push_back(pair.second.get());
    }
 }