Browse Source

Merge pull request #43861 from JFonS/fix_gizmo_defval

Fix binding of default value in EditorSpatialGizmoPlugin::get_material()
Rémi Verschelde 4 years ago
parent
commit
613b76cfd5

+ 1 - 1
doc/classes/EditorNode3DGizmoPlugin.xml

@@ -125,7 +125,7 @@
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="gizmo" type="EditorNode3DGizmo">
+			<argument index="1" name="gizmo" type="EditorNode3DGizmo" default="null">
 			</argument>
 			<description>
 				Gets material from the internal list of materials. If an [EditorNode3DGizmo] is provided, it will try to get the corresponding variant (selected and/or editable).

+ 1 - 1
editor/plugins/node_3d_editor_plugin.cpp

@@ -6847,7 +6847,7 @@ void EditorNode3DGizmoPlugin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("create_handle_material", "name", "billboard", "texture"), &EditorNode3DGizmoPlugin::create_handle_material, DEFVAL(false), DEFVAL(Variant()));
 	ClassDB::bind_method(D_METHOD("add_material", "name", "material"), &EditorNode3DGizmoPlugin::add_material);
 
-	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::INT, "get_priority"));