summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Fernandez <marcelofg55@gmail.com>2017-09-23 23:30:00 -0300
committerMarcelo Fernandez <marcelofg55@gmail.com>2017-09-23 23:30:00 -0300
commit3571087843d594b927c9c76cf12483371c6a7ca5 (patch)
treea26b4c6d237c9ddbd79bc7970b3f137c9b8b60e2
parent3c857033df954b481fb6ba9545b074588b1aee02 (diff)
Fix possible infinite loop with bucket fill tool
-rw-r--r--editor/plugins/tile_map_editor_plugin.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp
index b85ffd6c67..328d07d7a8 100644
--- a/editor/plugins/tile_map_editor_plugin.cpp
+++ b/editor/plugins/tile_map_editor_plugin.cpp
@@ -351,6 +351,10 @@ PoolVector<Vector2> TileMapEditor::_bucket_fill(const Point2i &p_start, bool era
return PoolVector<Vector2>();
}
+ if (id == prev_id) {
+ return PoolVector<Vector2>();
+ }
+
Rect2i r = node->get_item_rect();
r.position = r.position / node->get_cell_size();
r.size = r.size / node->get_cell_size();