Merge pull request #45545 from abaire/relaxes_gltf_name_sanitization

Relaxes node name sanitization in gltf documents.
This commit is contained in:
Rémi Verschelde 2021-03-09 14:54:33 +01:00 committed by GitHub
commit 83b1acdc60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 99 additions and 34 deletions

View file

@ -1021,22 +1021,8 @@ void Node::_set_name_nocheck(const StringName &p_name) {
data.name = p_name;
}
String Node::invalid_character = ". : @ / \"";
bool Node::_validate_node_name(String &p_name) {
String name = p_name;
Vector<String> chars = Node::invalid_character.split(" ");
for (int i = 0; i < chars.size(); i++) {
name = name.replace(chars[i], "");
}
bool is_valid = name == p_name;
p_name = name;
return is_valid;
}
void Node::set_name(const String &p_name) {
String name = p_name;
_validate_node_name(name);
String name = p_name.validate_node_name();
ERR_FAIL_COND(name == "");
data.name = name;