diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-03 17:31:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 17:31:48 +0100 |
| commit | a2803f3d869d92666e59b5750ec65af54c7ac805 (patch) | |
| tree | de31d4ef943e5aca7f40fc6a9ad898f23ba17405 /scene/main | |
| parent | 25bea735449d4e762e3c5f6b960d5f5b9cf79ac1 (diff) | |
| parent | de4f29f458fd07d9fb132e38662359e2850c566c (diff) | |
Merge pull request #54072 from KoBeWi/hrcr_is_ded
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/node.cpp | 7 | ||||
| -rw-r--r-- | scene/main/node.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 189aebb47d..cb26698394 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -908,17 +908,12 @@ void Node::set_name(const String &p_name) { } } -static bool node_hrcr = false; static SafeRefCount node_hrcr_count; void Node::init_node_hrcr() { node_hrcr_count.init(1); } -void Node::set_human_readable_collision_renaming(bool p_enabled) { - node_hrcr = p_enabled; -} - #ifdef TOOLS_ENABLED String Node::validate_child_name(Node *p_child) { StringName name = p_child->data.name; @@ -930,7 +925,7 @@ String Node::validate_child_name(Node *p_child) { void Node::_validate_child_name(Node *p_child, bool p_force_human_readable) { /* Make sure the name is unique */ - if (node_hrcr || p_force_human_readable) { + if (p_force_human_readable) { //this approach to autoset node names is human readable but very slow //it's turned on while running in the editor diff --git a/scene/main/node.h b/scene/main/node.h index e59a7a390a..c308ec4fac 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -437,7 +437,6 @@ public: void queue_delete(); //hacks for speed - static void set_human_readable_collision_renaming(bool p_enabled); static void init_node_hrcr(); void force_parent_owned() { data.parent_owned = true; } //hack to avoid duplicate nodes |