Merge pull request #7406 from neikeq/pr-issue-5076

TileMap: _update_dirty_quadrants() cancel pending update pre return
This commit is contained in:
Rémi Verschelde 2017-01-02 15:11:23 +01:00 committed by GitHub
commit 6428ebd91f

View file

@ -268,10 +268,10 @@ void TileMap::_update_dirty_quadrants() {
if (!pending_update) if (!pending_update)
return; return;
if (!is_inside_tree()) if (!is_inside_tree() || !tile_set.is_valid()) {
return; pending_update = false;
if (!tile_set.is_valid())
return; return;
}
VisualServer *vs = VisualServer::get_singleton(); VisualServer *vs = VisualServer::get_singleton();
Physics2DServer *ps = Physics2DServer::get_singleton(); Physics2DServer *ps = Physics2DServer::get_singleton();