Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-master

Also reran make style-code and manually discarded anything related to fill extrusion layers.
This commit is contained in:
Minh Nguyễn
2016-12-20 12:41:40 -08:00
153 changed files with 4808 additions and 2364 deletions

View File

@@ -923,6 +923,13 @@ void Map::removeImage(const std::string& name) {
impl->onUpdate(Update::Repaint);
}
const SpriteImage* Map::getImage(const std::string& name) {
if (impl->style) {
return impl->style->spriteAtlas->getSprite(name).get();
}
return nullptr;
}
#pragma mark - Defaults
std::string Map::getStyleName() const {