Skip to content

Commit 09609c1

Browse files
committed
Merge pull request #111043 from HolonProduction/rm-import-path
Remove unused `import_path` member from `Node`
2 parents 45502d1 + 743e0ed commit 09609c1

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

scene/main/node.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3456,20 +3456,6 @@ void Node::queue_free() {
34563456
}
34573457
}
34583458

3459-
void Node::set_import_path(const NodePath &p_import_path) {
3460-
#ifdef TOOLS_ENABLED
3461-
data.import_path = p_import_path;
3462-
#endif
3463-
}
3464-
3465-
NodePath Node::get_import_path() const {
3466-
#ifdef TOOLS_ENABLED
3467-
return data.import_path;
3468-
#else
3469-
return NodePath();
3470-
#endif
3471-
}
3472-
34733459
#ifdef TOOLS_ENABLED
34743460
static void _add_nodes_to_options(const Node *p_base, const Node *p_node, List<String> *r_options) {
34753461
if (p_node != p_base && !p_node->get_owner()) {
@@ -3873,9 +3859,6 @@ void Node::_bind_methods() {
38733859
ClassDB::bind_method(D_METHOD("set_editor_description", "editor_description"), &Node::set_editor_description);
38743860
ClassDB::bind_method(D_METHOD("get_editor_description"), &Node::get_editor_description);
38753861

3876-
ClassDB::bind_method(D_METHOD("_set_import_path", "import_path"), &Node::set_import_path);
3877-
ClassDB::bind_method(D_METHOD("_get_import_path"), &Node::get_import_path);
3878-
38793862
ClassDB::bind_method(D_METHOD("set_unique_name_in_owner", "enable"), &Node::set_unique_name_in_owner);
38803863
ClassDB::bind_method(D_METHOD("is_unique_name_in_owner"), &Node::is_unique_name_in_owner);
38813864

@@ -3886,8 +3869,6 @@ void Node::_bind_methods() {
38863869
ClassDB::bind_method(D_METHOD("_set_property_pinned", "property", "pinned"), &Node::set_property_pinned);
38873870
#endif
38883871

3889-
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "_import_path", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_import_path", "_get_import_path");
3890-
38913872
{
38923873
MethodInfo mi;
38933874

scene/main/node.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,6 @@ class Node : public Object {
207207
StringName name;
208208
SceneTree *tree = nullptr;
209209

210-
#ifdef TOOLS_ENABLED
211-
NodePath import_path; // Path used when imported, used by scene editors to keep tracking.
212-
#endif
213210
String editor_description;
214211

215212
Viewport *viewport = nullptr;
@@ -771,9 +768,6 @@ class Node : public Object {
771768
//hacks for speed
772769
static void init_node_hrcr();
773770

774-
void set_import_path(const NodePath &p_import_path); //path used when imported, used by scene editors to keep tracking
775-
NodePath get_import_path() const;
776-
777771
bool is_owned_by_parent() const;
778772

779773
void clear_internal_tree_resource_paths();

0 commit comments

Comments
 (0)