1
0
mirror of https://github.com/godotengine/godot synced 2024-07-05 17:18:46 +00:00

Merge pull request #91899 from AThousandShips/script_name_fix

Fix outdated name for `script` `StringName`
This commit is contained in:
Rémi Verschelde 2024-05-13 12:55:53 +02:00
commit bcaaf2b5c5
No known key found for this signature in database
GPG Key ID: C3336907360768E1

View File

@ -2667,8 +2667,6 @@ Node *Node::_duplicate(int p_flags, HashMap<const Node *, Node *> *r_duplimap) c
node->data.editable_instance = data.editable_instance;
}
StringName script_property_name = CoreStringName(script);
List<const Node *> hidden_roots;
List<const Node *> node_tree;
node_tree.push_front(this);
@ -2865,7 +2863,7 @@ void Node::remap_nested_resources(Ref<Resource> p_resource, const HashMap<Ref<Re
void Node::_duplicate_properties(const Node *p_root, const Node *p_original, Node *p_copy, int p_flags) const {
List<PropertyInfo> props;
p_original->get_property_list(&props);
StringName script_property_name = CoreStringNames::get_singleton()->_script;
const StringName &script_property_name = CoreStringName(script);
if (p_flags & DUPLICATE_SCRIPTS) {
bool is_valid = false;
Variant scr = p_original->get(script_property_name, &is_valid);