diff options
| author | Rémi Verschelde | 2017-08-25 08:37:38 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-25 08:37:38 +0200 |
| commit | 490aef93699abc00da58f73b1596fb3473fd53c6 (patch) | |
| tree | 7912c7a540eca6b09392bbd2aa2f30fefe37f51a /editor/plugins/particles_editor_plugin.cpp | |
| parent | b1c0e45b03aa14453846c9a888763077eef2476b (diff) | |
| parent | cacced7e507f7603bacc03ae2616e58f0ede122a (diff) | |
| download | godot-490aef93699abc00da58f73b1596fb3473fd53c6.tar.gz godot-490aef93699abc00da58f73b1596fb3473fd53c6.tar.zst godot-490aef93699abc00da58f73b1596fb3473fd53c6.zip | |
Merge pull request #10581 from hpvb/fix-gcc6+
Make cast_to a static member of Object.
Diffstat (limited to '')
| -rw-r--r-- | editor/plugins/particles_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp index 1e3723a91..ef959682c 100644 --- a/editor/plugins/particles_editor_plugin.cpp +++ b/editor/plugins/particles_editor_plugin.cpp @@ -51,7 +51,7 @@ void ParticlesEditor::_node_selected(const NodePath &p_path) { if (!sel) return; - VisualInstance *vi = sel->cast_to<VisualInstance>(); + VisualInstance *vi = Object::cast_to<VisualInstance>(sel); if (!vi) { err_dialog->set_text(TTR("Node does not contain geometry.")); @@ -135,7 +135,7 @@ void ParticlesEditor::_menu_option(int p_option) { /* Node *root = get_scene()->get_root_node(); ERR_FAIL_COND(!root); - EditorNode *en = root->cast_to<EditorNode>(); + EditorNode *en = Object::cast_to<EditorNode>(root); ERR_FAIL_COND(!en); Node * node = en->get_edited_scene(); */ @@ -461,7 +461,7 @@ ParticlesEditor::ParticlesEditor() { void ParticlesEditorPlugin::edit(Object *p_object) { - particles_editor->edit(p_object->cast_to<Particles>()); + particles_editor->edit(Object::cast_to<Particles>(p_object)); } bool ParticlesEditorPlugin::handles(Object *p_object) const { |