From 657f83148c18381f87b55ab5013f76ebef573bfb Mon Sep 17 00:00:00 2001
From: Peter Oberrauner <thealmostbearded@gmail.com>
Date: Tue, 26 Feb 2019 23:45:01 +0100
Subject: [PATCH] Allow Creation of Multiple Collision Shapes for Tiles #24003

---
 editor/plugins/tile_set_editor_plugin.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp
index 1bcb7513e0c..5f4c4a610ac 100644
--- a/editor/plugins/tile_set_editor_plugin.cpp
+++ b/editor/plugins/tile_set_editor_plugin.cpp
@@ -1425,6 +1425,7 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) {
 									workspace->update();
 								} else {
 									creating_shape = true;
+									edited_collision_shape = Ref<ConvexPolygonShape2D>();
 									current_shape.resize(0);
 									current_shape.push_back(snap_point(pos));
 									workspace->update();
@@ -1444,6 +1445,7 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) {
 					} else if (tools[SHAPE_NEW_RECTANGLE]->is_pressed()) {
 						if (mb.is_valid()) {
 							if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
+								edited_collision_shape = Ref<ConvexPolygonShape2D>();
 								current_shape.resize(0);
 								current_shape.push_back(snap_point(shape_anchor));
 								current_shape.push_back(snap_point(shape_anchor + Vector2(current_tile_region.size.x, 0)));