summaryrefslogtreecommitdiff
path: root/scene/2d
diff options
context:
space:
mode:
authorIgnacio Etcheverry <ignalfonsore@gmail.com>2017-01-01 18:31:29 +0100
committerIgnacio Etcheverry <ignalfonsore@gmail.com>2017-01-01 21:08:12 +0100
commit5b3acd287dcc08e6a05f7526f3bd28c5a00d8075 (patch)
tree65e8a9b5dd1675fdeba6cf9b53c9714417dbf487 /scene/2d
parentc798ff15510997fdbe6848687804f5e2cb17eefb (diff)
TileMap: _update_dirty_quadrants() cancel pending update pre return
Diffstat (limited to 'scene/2d')
-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 cc904e4d04..776d973bee 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();