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 /editor | |
| parent | 18bb36707fb7e2d940e3698a7ffa097be23cb69b (diff) | |
| parent | 61cc1c8624cdf2ef56b807c70f76dd96cc0ebcb7 (diff) | |
| download | redot-engine-83b1acdc60028ba3368ae841800f5813a1f2e775.tar.gz | |
Merge pull request #45545 from abaire/relaxes_gltf_name_sanitization
Relaxes node name sanitization in gltf documents.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/scene_tree_editor.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index b6347d3b46..2d739202fb 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -776,9 +776,11 @@ void SceneTreeEditor::_renamed() { return; } - String new_name = which->get_text(0); - if (!Node::_validate_node_name(new_name)) { - error->set_text(TTR("Invalid node name, the following characters are not allowed:") + "\n" + Node::invalid_character); + String raw_new_name = which->get_text(0); + String new_name = raw_new_name.validate_node_name(); + + if (new_name != raw_new_name) { + error->set_text(TTR("Invalid node name, the following characters are not allowed:") + "\n" + String::invalid_node_name_characters); error->popup_centered(); if (new_name.is_empty()) { |