summaryrefslogtreecommitdiffstats
path: root/scene/main/node.cpp
diff options
context:
space:
mode:
authorabaire <erik.abair@gmail.com>2021-01-28 12:48:12 -0800
committerErik Abair <erik.abair@gmail.com>2021-02-24 08:22:27 -0800
commit61cc1c8624cdf2ef56b807c70f76dd96cc0ebcb7 (patch)
tree6e941c9222b788269c31352afeda108254e918fb /scene/main/node.cpp
parente5bb89cdd5e92fa6fdeff78aad08bf0cbfbcc692 (diff)
downloadredot-engine-61cc1c8624cdf2ef56b807c70f76dd96cc0ebcb7.tar.gz
Relaxes Node naming constraints in glTF documents to match the Editor.
Diffstat (limited to 'scene/main/node.cpp')
-rw-r--r--scene/main/node.cpp16
1 files changed, 1 insertions, 15 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 9ac3b4a691..1f5b54d89e 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -981,22 +981,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;