From 6479b5673f4eca4fb05d4f6088df7b5bb03ffb4a Mon Sep 17 00:00:00 2001 From: kobewi Date: Wed, 29 May 2024 13:18:19 +0200 Subject: [PATCH] Remove unused base_hint from EditorPropertyNodePath --- editor/editor_properties.cpp | 11 +++-------- editor/editor_properties.h | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 103ea3ffc32b..a455258a6d4e 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -2922,8 +2922,7 @@ void EditorPropertyNodePath::update_property() { assign->set_icon(EditorNode::get_singleton()->get_object_icon(target_node, "Node")); } -void EditorPropertyNodePath::setup(const NodePath &p_base_hint, const Vector &p_valid_types, bool p_use_path_from_scene_root, bool p_editing_node) { - base_hint = p_base_hint; +void EditorPropertyNodePath::setup(const Vector &p_valid_types, bool p_use_path_from_scene_root, bool p_editing_node) { valid_types = p_valid_types; editing_node = p_editing_node; use_path_from_scene_root = p_use_path_from_scene_root; @@ -2943,10 +2942,6 @@ void EditorPropertyNodePath::_notification(int p_what) { } Node *EditorPropertyNodePath::get_base_node() { - if (!base_hint.is_empty() && get_tree()->get_root()->has_node(base_hint)) { - return get_tree()->get_root()->get_node(base_hint); - } - Node *base_node = Object::cast_to(get_edited_object()); if (!base_node) { @@ -3800,7 +3795,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_ if (p_hint == PROPERTY_HINT_NODE_PATH_VALID_TYPES && !p_hint_text.is_empty()) { Vector types = p_hint_text.split(",", false); Vector sn = Variant(types); //convert via variant - editor->setup(NodePath(), sn, (p_usage & PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT)); + editor->setup(sn, (p_usage & PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT)); } return editor; @@ -3814,7 +3809,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_ EditorPropertyNodePath *editor = memnew(EditorPropertyNodePath); Vector types = p_hint_text.split(",", false); Vector sn = Variant(types); //convert via variant - editor->setup(NodePath(), sn, false, true); + editor->setup(sn, false, true); return editor; } else { EditorPropertyResource *editor = memnew(EditorPropertyResource); diff --git a/editor/editor_properties.h b/editor/editor_properties.h index f2c5497e4f32..e9e788ab7bd2 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -653,7 +653,6 @@ class EditorPropertyNodePath : public EditorProperty { LineEdit *edit = nullptr; SceneTreeDialog *scene_tree = nullptr; - NodePath base_hint; bool use_path_from_scene_root = false; bool editing_node = false; @@ -679,7 +678,7 @@ class EditorPropertyNodePath : public EditorProperty { public: virtual void update_property() override; - void setup(const NodePath &p_base_hint, const Vector &p_valid_types, bool p_use_path_from_scene_root = true, bool p_editing_node = false); + void setup(const Vector &p_valid_types, bool p_use_path_from_scene_root = true, bool p_editing_node = false); EditorPropertyNodePath(); };