From ba2b09b034b29aebd9237cb96e3d05ffa808a4f0 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Wed, 27 Mar 2019 22:49:19 +0530 Subject: [PATCH] Revert "Updated tile_set_editor_plugin.cpp And area.cpp# This is a combination of 2 commits." This reverts commit 2d995372d8e4e47086fbf0b8a71224cd7b763f81. --- editor/plugins/tile_set_editor_plugin.cpp | 4 +--- scene/3d/area.cpp | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index 05de0519e65..dc099b84a7c 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -2417,9 +2417,7 @@ void TileSetEditor::draw_polygon_shapes() { colors.push_back(c_bg); } } - if (polygon.size() == 0) - continue; - else if (polygon.size() > 2) { + if (polygon.size() > 2) { workspace->draw_polygon(polygon, colors); } diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index 13d9181082e..e58e26d2d10 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -756,6 +756,7 @@ Area::Area() : monitorable = false; collision_mask = 1; collision_layer = 1; + set_ray_pickable(false); set_monitoring(true); set_monitorable(true);