diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-25 08:37:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 08:37:38 +0200 |
| commit | 490aef93699abc00da58f73b1596fb3473fd53c6 (patch) | |
| tree | 7912c7a540eca6b09392bbd2aa2f30fefe37f51a /editor/plugins/collision_polygon_editor_plugin.cpp | |
| parent | b1c0e45b03aa14453846c9a888763077eef2476b (diff) | |
| parent | cacced7e507f7603bacc03ae2616e58f0ede122a (diff) | |
Merge pull request #10581 from hpvb/fix-gcc6+
Make cast_to a static member of Object.
Diffstat (limited to 'editor/plugins/collision_polygon_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/collision_polygon_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp index 5b364ed2c1..5520d196e0 100644 --- a/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_editor_plugin.cpp @@ -464,7 +464,7 @@ void CollisionPolygonEditor::edit(Node *p_collision_polygon) { if (p_collision_polygon) { - node = p_collision_polygon->cast_to<CollisionPolygon>(); + node = Object::cast_to<CollisionPolygon>(p_collision_polygon); wip.clear(); wip_active = false; edited_point = -1; @@ -555,7 +555,7 @@ CollisionPolygonEditor::~CollisionPolygonEditor() { void CollisionPolygonEditorPlugin::edit(Object *p_object) { - collision_polygon_editor->edit(p_object->cast_to<Node>()); + collision_polygon_editor->edit(Object::cast_to<Node>(p_object)); } bool CollisionPolygonEditorPlugin::handles(Object *p_object) const { |