From 6d60660cd669cd5569793527a1cb37eefc0a6f42 Mon Sep 17 00:00:00 2001 From: David Snopek Date: Wed, 3 Dec 2025 08:34:04 -0600 Subject: [PATCH] Unmark `Node::is_editable_instance()` parameter as required --- scene/main/node.cpp | 6 ++++-- scene/main/node.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scene/main/node.cpp b/scene/main/node.cpp index c1de5d652a1..7218287e239 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2689,8 +2689,10 @@ void Node::set_editable_instance(RequiredParam rp_node, bool p_editable) { p_node->_emit_editor_state_changed(); } -bool Node::is_editable_instance(RequiredParam rp_node) const { - EXTRACT_PARAM_OR_FAIL_V(p_node, rp_node, false); +bool Node::is_editable_instance(const Node *p_node) const { + if (!p_node) { + return false; // Easier, null is never editable. :) + } ERR_FAIL_COND_V(!is_ancestor_of(p_node), false); return p_node->data.editable_instance; } diff --git a/scene/main/node.h b/scene/main/node.h index 33489595a32..26179defc1a 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -622,7 +622,7 @@ public: String get_editor_description() const; void set_editable_instance(RequiredParam rp_node, bool p_editable); - bool is_editable_instance(RequiredParam rp_node) const; + bool is_editable_instance(const Node *p_node) const; Node *get_deepest_editable_node(Node *p_start_node) const; #ifdef TOOLS_ENABLED