godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79050 from capnm/fix_teststr_what 

Fix import hints that are followed by dot.number
This commit is contained in:
Yuri Sizov 2023-07-05 15:59:44 +02:00 committed by GitHub
parent e5cca53a94 470083caed
commit c16afc1c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/String.xml
View File

@ -1054,7 +1054,7 @@
<method name="validate_node_name" qualifiers="const">
<return type="String" />
<description>
Returns a copy of the string with all characters that are not allowed in [member Node.name] removed ([code].[/code] [code]:[/code] [code]@[/code] [code]/[/code] [code]"[/code] [code]%[/code]).
Returns a copy of the string with all characters that are not allowed in [member Node.name] ([code].[/code] [code]:[/code] [code]@[/code] [code]/[/code] [code]"[/code] [code]%[/code]) replaced with underscores.
</description>
</method>
<method name="xml_escape" qualifiers="const">

2
doc/classes/StringName.xml
View File

@ -961,7 +961,7 @@
<method name="validate_node_name" qualifiers="const">
<return type="String" />
<description>
Returns a copy of the string with all characters that are not allowed in [member Node.name] removed ([code].[/code] [code]:[/code] [code]@[/code] [code]/[/code] [code]"[/code] [code]%[/code]).
Returns a copy of the string with all characters that are not allowed in [member Node.name] ([code].[/code] [code]:[/code] [code]@[/code] [code]/[/code] [code]"[/code] [code]%[/code]) replaced with underscores.
</description>
</method>
<method name="xml_escape" qualifiers="const">

10
editor/import/resource_importer_scene.cpp
View File

@ -313,8 +313,9 @@ String ResourceImporterScene::get_preset_name(int p_idx) const {
static bool _teststr(const String &p_what, const String &p_str) {
String what = p_what;
//remove trailing spaces and numbers, some apps like blender add ".number" to duplicates so also compensate for this
while (what.length() && (is_digit(what[what.length() - 1]) || what[what.length() - 1] <= 32 || what[what.length() - 1] == '.')) {
// Remove trailing spaces and numbers, some apps like blender add ".number" to duplicates
// (dot is replaced with _ as invalid character) so also compensate for this.
while (what.length() && (is_digit(what[what.length() - 1]) || what[what.length() - 1] <= 32 || what[what.length() - 1] == '_')) {
what = what.substr(0, what.length() - 1);
}
@ -333,8 +334,9 @@ static bool _teststr(const String &p_what, const String &p_str) {
static String _fixstr(const String &p_what, const String &p_str) {
String what = p_what;
//remove trailing spaces and numbers, some apps like blender add ".number" to duplicates so also compensate for this
while (what.length() && (is_digit(what[what.length() - 1]) || what[what.length() - 1] <= 32 || what[what.length() - 1] == '.')) {
// Remove trailing spaces and numbers, some apps like blender add ".number" to duplicates
// (dot is replaced with _ as invalid character) so also compensate for this.
while (what.length() && (is_digit(what[what.length() - 1]) || what[what.length() - 1] <= 32 || what[what.length() - 1] == '_')) {
what = what.substr(0, what.length() - 1);
}