瀏覽代碼

Merge pull request #40473 from rcorre/gizmo-doc

Fix return type on EditorNode3DGizmoPlugin::get_priority.
Rémi Verschelde 5 年之前
父節點
當前提交
c646768ba2
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      doc/classes/EditorNode3DGizmoPlugin.xml
  2. 1 1
      editor/plugins/node_3d_editor_plugin.cpp

+ 1 - 1
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.

+ 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>()));
 
 	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"));