diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-03-09 14:54:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-09 14:54:33 +0100 |
commit | 83b1acdc60028ba3368ae841800f5813a1f2e775 (patch) | |
tree | 7ece3c90c9925f2c9488f7514e84bcbbd6a2c35c /scene | |
parent | 18bb36707fb7e2d940e3698a7ffa097be23cb69b (diff) | |
parent | 61cc1c8624cdf2ef56b807c70f76dd96cc0ebcb7 (diff) |
Merge pull request #45545 from abaire/relaxes_gltf_name_sanitization
Relaxes node name sanitization in gltf documents.
Diffstat (limited to 'scene')
-rw-r--r-- | scene/main/node.cpp | 16 | ||||
-rw-r--r-- | scene/main/node.h | 6 |
2 files changed, 1 insertions, 21 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 9d8c7981e6..137e1726f9 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -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; diff --git a/scene/main/node.h b/scene/main/node.h index d47d271a10..b1e51d2aee 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -190,12 +190,6 @@ private: _FORCE_INLINE_ bool _can_process(bool p_paused) const; -#ifdef TOOLS_ENABLED - friend class SceneTreeEditor; -#endif - static String invalid_character; - static bool _validate_node_name(String &p_name); - protected: void _block() { data.blocked++; } void _unblock() { data.blocked--; } |