diff options
| author | Ignacio Etcheverry | 2017-08-19 01:02:56 +0200 |
|---|---|---|
| committer | Ignacio Etcheverry | 2017-08-19 01:29:45 +0200 |
| commit | 90b8a5b71ef79e0339826507c4b290f0c51b7cd2 (patch) | |
| tree | 6f24bbc63ef9674687589f9ec9017e9fd09d266e /scene/2d/collision_shape_2d.cpp | |
| parent | fd69604bd9dc743494a7818f25f384cc7f521b33 (diff) | |
| download | godot-90b8a5b71ef79e0339826507c4b290f0c51b7cd2.tar.gz godot-90b8a5b71ef79e0339826507c4b290f0c51b7cd2.tar.zst godot-90b8a5b71ef79e0339826507c4b290f0c51b7cd2.zip | |
Diffstat (limited to 'scene/2d/collision_shape_2d.cpp')
| -rw-r--r-- | scene/2d/collision_shape_2d.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index ff4aa245e..3fda4ab46 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -28,7 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "collision_shape_2d.h" + #include "collision_object_2d.h" +#include "engine.h" #include "scene/resources/capsule_shape_2d.h" #include "scene/resources/circle_shape_2d.h" #include "scene/resources/concave_polygon_shape_2d.h" @@ -59,7 +61,7 @@ void CollisionShape2D::_notification(int p_what) { parent->shape_owner_set_one_way_collision(owner_id, one_way_collision); } - /*if (get_tree()->is_editor_hint()) { + /*if (Engine::get_singleton()->is_editor_hint()) { //display above all else set_z_as_relative(false); set_z(VS::CANVAS_ITEM_Z_MAX - 1); @@ -90,7 +92,7 @@ void CollisionShape2D::_notification(int p_what) { } break;*/ case NOTIFICATION_DRAW: { - if (!get_tree()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) { + if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) { break; } |