Browse Source

Revert "Updated tile_set_editor_plugin.cpp And area.cpp# This is a combination of 2 commits."

This reverts commit 2d995372d8e4e47086fbf0b8a71224cd7b763f81.
Siddharth 6 years ago
parent
commit
ba2b09b034
2 changed files with 2 additions and 3 deletions
  1. 1 3
      editor/plugins/tile_set_editor_plugin.cpp
  2. 1 0
      scene/3d/area.cpp

+ 1 - 3
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);
 					}
 

+ 1 - 0
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);