godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Change Node set_name to use StringName

Browse Source
This commit is contained in:
Aaron Franke
2023-04-28 15:59:00 -05:00
parent 730adf4801
commit a404b668a1
6 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scene/main/node.cpp
View File

@@ -29,6 +29,7 @@
/**************************************************************************/
#include "node.h"
#include "node.compat.inc"
#include "core/config/project_settings.h"
#include "core/io/resource_loader.h"
@@ -1552,17 +1553,23 @@ void Node::_set_name_nocheck(const StringName &p_name) {
data.name = p_name;
}
void Node::set_name(const String &p_name) {
void Node::set_name(const StringName &p_name) {
ERR_FAIL_COND_MSG(data.inside_tree && !Thread::is_main_thread(), "Changing the name to nodes inside the SceneTree is only allowed from the main thread. Use `set_name.call_deferred(new_name)`.");
String name = p_name.validate_node_name();
ERR_FAIL_COND(name.is_empty());
const StringName old_name = data.name;
{
const String input_name_str = String(p_name);
ERR_FAIL_COND(input_name_str.is_empty());
const String validated_node_name_string = input_name_str.validate_node_name();
if (input_name_str == validated_node_name_string) {
data.name = p_name;
} else {
data.name = StringName(validated_node_name_string);
}
}
if (data.unique_name_in_owner && data.owner) {
_release_unique_name_in_owner();
}
String old_name = data.name;
data.name = name;
if (data.parent) {
data.parent->_validate_child_name(this, true);