From 8798387770784cf9f616f5604f09238ec424e7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn?= <bjornmp.dev@gmail.com>
Date: Tue, 2 Sep 2025 02:49:32 +0200
Subject: [PATCH] Improve identification of edits on property `Object->script`

Narrows down the criteria to determine if the property being edited with the `EditorResourcePicker` is actually the `Object->script` property.
---
 editor/inspector/editor_resource_picker.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/editor/inspector/editor_resource_picker.cpp b/editor/inspector/editor_resource_picker.cpp
index 141c05498e..ee7db9fc68 100644
--- a/editor/inspector/editor_resource_picker.cpp
+++ b/editor/inspector/editor_resource_picker.cpp
@@ -778,10 +778,19 @@ bool EditorResourcePicker::_is_type_valid(const String &p_type_name, const HashS
 }
 
 bool EditorResourcePicker::_is_custom_type_script() const {
-	Ref<Script> resource_as_script = edited_resource;
+	EditorProperty *editor_property = Object::cast_to<EditorProperty>(get_parent());
+	if (!editor_property) {
+		return false;
+	}
 
-	if (resource_as_script.is_valid() && resource_owner && resource_owner->has_meta(SceneStringName(_custom_type_script))) {
-		return true;
+	// Check if the property being edited is 'script'.
+	if (editor_property->get_edited_property() == CoreStringName(script)) {
+		// If there's currently a valid script assigned and the owning Node/Resource also has a custom type script assigned, then
+		// the currently assigned script is either the custom type script itself or an extension of it.
+		Ref<Script> resource_as_script = edited_resource;
+		if (resource_as_script.is_valid() && resource_owner && resource_owner->has_meta(SceneStringName(_custom_type_script))) {
+			return true;
+		}
 	}
 
 	return false;