diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-02 22:21:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 22:21:31 +0200 |
| commit | 741637b966dd644263032c7f937d990cfba52411 (patch) | |
| tree | a4fd2924e160161977ab951337dcbed8273d4901 /editor/scene_tree_editor.cpp | |
| parent | a02fec47a05913318c9b55d7f5f692194d1de5f1 (diff) | |
| parent | 6758b6c1317bbdabd04a2c9f8dc16876429b6bfb (diff) | |
Merge pull request #18451 from volzhs/node-name
Check invalid node name
Diffstat (limited to 'editor/scene_tree_editor.cpp')
| -rw-r--r-- | editor/scene_tree_editor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index e38347a653..64d278c0c5 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -644,11 +644,12 @@ void SceneTreeEditor::_renamed() { ERR_FAIL_COND(!n); String new_name = which->get_text(0); - if (new_name.find(".") != -1 || new_name.find("/") != -1) { + if (!Node::_validate_node_name(new_name)) { - error->set_text(TTR("Invalid node name, the following characters are not allowed:") + "\n \".\", \"/\""); + error->set_text(TTR("Invalid node name, the following characters are not allowed:") + "\n" + Node::invalid_character); error->popup_centered_minsize(); - new_name = n->get_name(); + + which->set_text(0, new_name); } if (new_name == n->get_name()) |