Merge pull request #52241 from Rubonnek/fix-simplify-path-ret

[3.x] Fix `String::simplify_path` return type
godotengine · Sep 3, 2021 · ef1c509 · ef1c509
2 parents d136ac7 + f5409e7
commit ef1c509
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
@@ -1688,7 +1688,7 @@ void register_variant_methods() {
 	ADDFUNC0R(STRING, BOOL, String, empty, varray());
 	ADDFUNC1R(STRING, STRING, String, humanize_size, INT, "size", varray());
 	ADDFUNC0R(STRING, BOOL, String, is_abs_path, varray());
-	ADDFUNC0R(STRING, BOOL, String, simplify_path, varray());
+	ADDFUNC0R(STRING, STRING, String, simplify_path, varray());
 	ADDFUNC0R(STRING, BOOL, String, is_rel_path, varray());
 	ADDFUNC0R(STRING, STRING, String, get_base_dir, varray());
 	ADDFUNC0R(STRING, STRING, String, get_file, varray());

diff --git a/doc/classes/String.xml b/doc/classes/String.xml
@@ -667,7 +667,7 @@
 			</description>
 		</method>
 		<method name="simplify_path">
-			<return type="bool" />
+			<return type="String" />
 			<description>
 				Returns a simplified canonical path.
 			</description>