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

TileMap: _update_dirty_quadrants() cancel pending update pre return

Merge pull request #7406 from neikeq/pr-issue-5076
6428ebd9 · Rémi Verschelde · GitHub · 3fc4ee62 · 5b3acd28 · 6428ebd9
Commit 6428ebd9 authored Jan 02, 2017 by Rémi Verschelde Committed by GitHub Jan 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

tile_map.cpp scene/2d/tile_map.cpp +3 -3

No files found.
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -268,10 +268,10 @@ void TileMap::_update_dirty_quadrants() {

 	if (!pending_update)
 		return;
-	if (!is_inside_tree())
-		return;
-	if (!tile_set.is_valid())
+	if (!is_inside_tree() || !tile_set.is_valid()) {
+		pending_update = false;
 		return;
+	}

 	VisualServer *vs = VisualServer::get_singleton();
 	Physics2DServer *ps = Physics2DServer::get_singleton();