diff options
| author | Siddharth <siddharth952@gmail.com> | 2019-03-18 17:00:30 +0530 |
|---|---|---|
| committer | Siddharth <siddharth952@gmail.com> | 2019-03-23 20:03:59 +0530 |
| commit | 2d995372d8e4e47086fbf0b8a71224cd7b763f81 (patch) | |
| tree | dac63ddaee6924409f5c7017f76d1b5d38a03074 | |
| parent | 6f404efd9a2693c146b20043b540946193298fcd (diff) | |
Updated tile_set_editor_plugin.cpp And area.cpp# This is a combination of 2 commits.
Updated tile_set_editor_plugin.cpp And area.cpp
Updated with clang-format
Updated tile_set_editor_plugin.cpp And area.cpp
| -rw-r--r-- | editor/plugins/tile_set_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | scene/3d/area.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index dc099b84a7..05de0519e6 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -2417,7 +2417,9 @@ void TileSetEditor::draw_polygon_shapes() { colors.push_back(c_bg); } } - if (polygon.size() > 2) { + if (polygon.size() == 0) + continue; + else if (polygon.size() > 2) { workspace->draw_polygon(polygon, colors); } diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index e58e26d2d1..13d9181082 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -756,7 +756,6 @@ Area::Area() : monitorable = false; collision_mask = 1; collision_layer = 1; - set_ray_pickable(false); set_monitoring(true); set_monitorable(true); |