diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-16 18:16:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 18:16:47 +0200 |
| commit | 0dd51fc72296ab71a27587cdb89a274d9178b607 (patch) | |
| tree | 3fdbb49dea6b3e24c8fbe3eda12630519468dfb1 /editor | |
| parent | a21ca962a40843b3be68a0ebc29dc5c697f5b059 (diff) | |
| parent | bffe4abb4dd42e919c7f5fc719beaaa4f7765f20 (diff) | |
Merge pull request #10252 from neikeq/pr-fix-some-stuff-<3
Some method fixes
Diffstat (limited to 'editor')
| -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"))); |