aboutsummaryrefslogtreecommitdiff
path: root/scene/2d/tile_map.cpp
diff options
context:
space:
mode:
authorIgnacio Etcheverry2017-01-01 18:31:29 +0100
committerRémi Verschelde2017-01-12 19:15:29 +0100
commitb5bdc60f58cdbe4506a5614591ce5e3838dda7c8 (patch)
treeef15b2191cecac3f5f7adef0b7f98c3c071c89a4 /scene/2d/tile_map.cpp
parentba50bb9cb187f51abd010a91761b23a0961aa3d4 (diff)
downloadgodot-b5bdc60f58cdbe4506a5614591ce5e3838dda7c8.tar.gz
godot-b5bdc60f58cdbe4506a5614591ce5e3838dda7c8.tar.zst
godot-b5bdc60f58cdbe4506a5614591ce5e3838dda7c8.zip
TileMap: _update_dirty_quadrants() cancel pending update pre return
(cherry picked from commit 5b3acd287dcc08e6a05f7526f3bd28c5a00d8075)
Diffstat (limited to '')
-rw-r--r--scene/2d/tile_map.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index 1a4f88c30..bffa7b941 100644
--- 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();