From 2599710793cebac9575420aafcfa80020e1565c1 Mon Sep 17 00:00:00 2001 From: VolTer Date: Mon, 15 Aug 2022 00:50:31 +0200 Subject: [PATCH] Rename NOTIFICATION_INSTANCED to NOTIFICATION_SCENE_INSTANTIATED --- doc/classes/Node.xml | 4 ++-- doc/classes/PackedScene.xml | 2 +- scene/main/node.cpp | 2 +- scene/main/node.h | 2 +- scene/resources/packed_scene.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml index 8cc8498609e..38a497b5620 100644 --- a/doc/classes/Node.xml +++ b/doc/classes/Node.xml @@ -856,8 +856,8 @@ Notification received when a node is unparented (parent removed it from the list of children). - - Notification received when the node is instantiated. + + Notification received by scene owner when its scene is instantiated. Notification received when a drag operation begins. All nodes receive this notification, not only the dragged one. diff --git a/doc/classes/PackedScene.xml b/doc/classes/PackedScene.xml index 821fc1ae956..038b774b975 100644 --- a/doc/classes/PackedScene.xml +++ b/doc/classes/PackedScene.xml @@ -92,7 +92,7 @@ - Instantiates the scene's node hierarchy. Triggers child scene instantiation(s). Triggers a [constant Node.NOTIFICATION_INSTANCED] notification on the root node. + Instantiates the scene's node hierarchy. Triggers child scene instantiation(s). Triggers a [constant Node.NOTIFICATION_SCENE_INSTANTIATED] notification on the root node. diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 6617bd17263..5c94c15a74e 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2937,7 +2937,7 @@ void Node::_bind_methods() { BIND_CONSTANT(NOTIFICATION_PROCESS); BIND_CONSTANT(NOTIFICATION_PARENTED); BIND_CONSTANT(NOTIFICATION_UNPARENTED); - BIND_CONSTANT(NOTIFICATION_INSTANCED); + BIND_CONSTANT(NOTIFICATION_SCENE_INSTANTIATED); BIND_CONSTANT(NOTIFICATION_DRAG_BEGIN); BIND_CONSTANT(NOTIFICATION_DRAG_END); BIND_CONSTANT(NOTIFICATION_PATH_RENAMED); diff --git a/scene/main/node.h b/scene/main/node.h index 0645c68eb91..13ca3abcd63 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -259,7 +259,7 @@ public: NOTIFICATION_PROCESS = 17, NOTIFICATION_PARENTED = 18, NOTIFICATION_UNPARENTED = 19, - NOTIFICATION_INSTANCED = 20, + NOTIFICATION_SCENE_INSTANTIATED = 20, NOTIFICATION_DRAG_BEGIN = 21, NOTIFICATION_DRAG_END = 22, NOTIFICATION_PATH_RENAMED = 23, diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index ac67e6e5e9f..0137c8cd2a8 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -1742,7 +1742,7 @@ Node *PackedScene::instantiate(GenEditState p_edit_state) const { s->set_scene_file_path(get_path()); } - s->notification(Node::NOTIFICATION_INSTANCED); + s->notification(Node::NOTIFICATION_SCENE_INSTANTIATED); return s; }