diff options
| author | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2017-08-11 13:35:38 +0200 |
|---|---|---|
| committer | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2017-08-16 18:05:10 +0200 |
| commit | bffe4abb4dd42e919c7f5fc719beaaa4f7765f20 (patch) | |
| tree | 57982c5a0b5736fbeee5819c3684f3cacccb0dfe | |
| parent | 1a04917fea6a769dbd540801daba5bab2b7b53ce (diff) | |
EditorPlugin: Renames virtual method hiding inherited method
| -rw-r--r-- | editor/editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 19c77ef737..d8c8d419b9 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -249,8 +249,8 @@ bool EditorPlugin::forward_spatial_gui_input(Camera *p_camera, const Ref<InputEv } String EditorPlugin::get_name() const { - if (get_script_instance() && get_script_instance()->has_method("get_name")) { - return get_script_instance()->call("get_name"); + if (get_script_instance() && get_script_instance()->has_method("get_plugin_name")) { + return get_script_instance()->call("get_plugin_name"); } return String(); @@ -450,7 +450,7 @@ void EditorPlugin::_bind_methods() { gizmo.return_val.hint = PROPERTY_HINT_RESOURCE_TYPE; gizmo.return_val.hint_string = "EditorSpatialGizmo"; ClassDB::add_virtual_method(get_class_static(), gizmo); - ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::STRING, "get_name")); + ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::STRING, "get_plugin_name")); ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::BOOL, "has_main_screen")); ClassDB::add_virtual_method(get_class_static(), MethodInfo("make_visible", PropertyInfo(Variant::BOOL, "visible"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo("edit", PropertyInfo(Variant::OBJECT, "object"))); |