Browse Source

Merge pull request #40473 from rcorre/gizmo-doc

Fix return type on EditorNode3DGizmoPlugin::get_priority.
Rémi Verschelde 5 years ago
parent
commit
c646768ba2

+ 1 - 1
doc/classes/EditorNode3DGizmoPlugin.xml

@@ -136,7 +136,7 @@
 			</description>
 			</description>
 		</method>
 		</method>
 		<method name="get_priority" qualifiers="virtual">
 		<method name="get_priority" qualifiers="virtual">
-			<return type="String">
+			<return type="int">
 			</return>
 			</return>
 			<description>
 			<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.
 				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.

+ 1 - 1
editor/plugins/node_3d_editor_plugin.cpp

@@ -6810,7 +6810,7 @@ void EditorNode3DGizmoPlugin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_material", "name", "gizmo"), &EditorNode3DGizmoPlugin::get_material); //, DEFVAL(Ref<EditorNode3DGizmo>()));
 	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_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, "can_be_hidden"));
 	BIND_VMETHOD(MethodInfo(Variant::BOOL, "is_selectable_when_hidden"));
 	BIND_VMETHOD(MethodInfo(Variant::BOOL, "is_selectable_when_hidden"));