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

Merge pull request #99765 from dalexeev/core-fix-json-from-to-native

Browse Source 
Core: Fix `JSON.{from,to}_native()` issues
This commit is contained in:
Thaddeus Crews
2024-12-10 14:15:53 -06:00
parent d108d4f29e bd1a35ce9e
commit 8f16f864a6
15 changed files with 1237 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/editor_autoload_settings.cpp
View File

@ -112,14 +112,12 @@ bool EditorAutoloadSettings::_autoload_name_is_valid(const String &p_name, Strin
return false;
}
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
if (Variant::get_type_name(Variant::Type(i)) == p_name) {
if (r_error) {
*r_error = TTR("Invalid name.") + " " + TTR("Must not collide with an existing built-in type name.");
}
return false;
if (Variant::get_type_by_name(p_name) < Variant::VARIANT_MAX) {
if (r_error) {
*r_error = TTR("Invalid name.") + " " + TTR("Must not collide with an existing built-in type name.");
}
return false;
}
for (int i = 0; i < CoreConstants::get_global_constant_count(); i++) {