Browse Source

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

(cherry picked from commit c6919a13da8e6b019be49aae9a7f0ebb28ef2c5e)
Ryan Roden-Corrent 5 years ago
parent
commit
d05a07235c

+ 1 - 1
doc/classes/EditorSpatialGizmoPlugin.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/spatial_editor_plugin.cpp

@@ -6624,7 +6624,7 @@ void EditorSpatialGizmoPlugin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_material", "name", "gizmo"), &EditorSpatialGizmoPlugin::get_material); //, DEFVAL(Ref<EditorSpatialGizmo>()));
 	ClassDB::bind_method(D_METHOD("get_material", "name", "gizmo"), &EditorSpatialGizmoPlugin::get_material); //, DEFVAL(Ref<EditorSpatialGizmo>()));
 
 
 	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"));