Merge pull request #84446 from KoBeWi/EditorYOLOPicker

Don't check resource type assigned in property
godotengine · Apr 26, 2024 · 8063ea9 · 8063ea9
2 parents caca54a + 0f755ce
commit 8063ea9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
@@ -3408,7 +3408,7 @@ void EditorPropertyResource::update_property() {
 		}
 	}
 
-	resource_picker->set_edited_resource(res);
+	resource_picker->set_edited_resource_no_check(res);
 }
 
 void EditorPropertyResource::collapse_all_folding() {

diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
@@ -896,7 +896,10 @@ void EditorResourcePicker::set_edited_resource(Ref<Resource> p_resource) {
 			ERR_FAIL_MSG(vformat("Failed to set a resource of the type '%s' because this EditorResourcePicker only accepts '%s' and its derivatives.", class_str, base_type));
 		}
 	}
+	set_edited_resource_no_check(p_resource);
+}
 
+void EditorResourcePicker::set_edited_resource_no_check(Ref<Resource> p_resource) {
 	edited_resource = p_resource;
 	_update_resource();
 }

diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h
@@ -127,6 +127,7 @@ class EditorResourcePicker : public HBoxContainer {
 	Vector<String> get_allowed_types() const;
 
 	void set_edited_resource(Ref<Resource> p_resource);
+	void set_edited_resource_no_check(Ref<Resource> p_resource);
 	Ref<Resource> get_edited_resource();
 
 	void set_toggle_mode(bool p_enable);
-Original file line number
+Diff line change
@@ Expand Up / @@ -3408,7 +3408,7 @@ void EditorPropertyResource::update_property() { @@
     		}
     	}
-    	resource_picker->set_edited_resource(res);
+    	resource_picker->set_edited_resource_no_check(res);
     }
     void EditorPropertyResource::collapse_all_folding() {
@@ Expand Down @@