diff options
| author | Ryan Roden-Corrent <ryan@rcorre.net> | 2020-07-17 14:45:54 -0400 |
|---|---|---|
| committer | Ryan Roden-Corrent <ryan@rcorre.net> | 2020-07-21 18:18:33 -0400 |
| commit | c6919a13da8e6b019be49aae9a7f0ebb28ef2c5e (patch) | |
| tree | 8b6a33330613c5aa5733ea7b59e4f5d2ed1929e5 | |
| parent | a5fb4451210625702474a8fac1dd880e78a409e9 (diff) | |
Fix bound return type on get_priority.
Also adds a description explaining gizmo priority.
Inferred from:
https://github.com/rcorre/godot/blob/e4363d001afd3e94e1c02f8af9291087dab7408e/editor/plugins/spatial_editor_plugin.cpp#L5867-L5880
https://github.com/rcorre/godot/blob/e4363d001afd3e94e1c02f8af9291087dab7408e/editor/plugins/spatial_editor_plugin.cpp#L6462-L6470
| -rw-r--r-- | doc/classes/EditorNode3DGizmoPlugin.xml | 2 | ||||
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/classes/EditorNode3DGizmoPlugin.xml b/doc/classes/EditorNode3DGizmoPlugin.xml index b81281b5b6..51130d6e45 100644 --- a/doc/classes/EditorNode3DGizmoPlugin.xml +++ b/doc/classes/EditorNode3DGizmoPlugin.xml @@ -136,7 +136,7 @@ </description> </method> <method name="get_priority" qualifiers="virtual"> - <return type="String"> + <return type="int"> </return> <description> Override this method to set the gizmo's priority. Higher values correspond to higher priority. If a gizmo with higher priority conflicts with another gizmo, only the gizmo with higher priority will be used. diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 6165f39561..f36ca893ab 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -6693,7 +6693,7 @@ void EditorNode3DGizmoPlugin::_bind_methods() { ClassDB::bind_method(D_METHOD("get_material", "name", "gizmo"), &EditorNode3DGizmoPlugin::get_material); //, DEFVAL(Ref<EditorNode3DGizmo>())); BIND_VMETHOD(MethodInfo(Variant::STRING, "get_name")); - BIND_VMETHOD(MethodInfo(Variant::STRING, "get_priority")); + BIND_VMETHOD(MethodInfo(Variant::INT, "get_priority")); BIND_VMETHOD(MethodInfo(Variant::BOOL, "can_be_hidden")); BIND_VMETHOD(MethodInfo(Variant::BOOL, "is_selectable_when_hidden")); |