Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	src/mbgl/shader/shader.cpp
This commit is contained in:
Leith Bade
2015-01-15 11:39:50 +11:00
13 changed files with 306 additions and 73 deletions

View File

@@ -301,6 +301,8 @@ void Map::run() {
mode = Mode::None;
fileSource.clearLoop();
}
terminate();
}
void Map::checkForPause() {
@@ -329,8 +331,9 @@ void Map::rerender() {
} else if (mode == Mode::Continuous) {
// We only send render events if we want to continuously update the map
// (== async rendering).
assert(asyncRender);
asyncRender->send();
if (asyncRender) {
asyncRender->send();
}
}
}
@@ -350,7 +353,9 @@ void Map::swapped() {
void Map::terminate() {
assert(painter);
view.activate();
painter->terminate();
view.deactivate();
}
#pragma mark - Setup