Merge branch 'master' into node

This commit is contained in:
John Firebaugh
2015-08-31 16:45:21 -07:00
80 changed files with 1318 additions and 401 deletions

View File

@@ -336,7 +336,6 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame)
if (!painter) {
painter = std::make_unique<Painter>(data);
painter->setup();
painter->updateRenderOrder(*style);
}
painter->setDebug(data.getDebug());
@@ -403,10 +402,6 @@ void MapContext::setSprite(const std::string& name, std::shared_ptr<const Sprite
void MapContext::onTileDataChanged() {
assert(util::ThreadContext::currentlyOn(util::ThreadType::Map));
if (painter) {
painter->updateRenderOrder(*style);
}
updateFlags |= Update::Repaint;
asyncUpdate->send();
}