Răsfoiți Sursa

Merge pull request #84446 from KoBeWi/EditorYOLOPicker

Don't check resource type assigned in property
Rémi Verschelde 1 an în urmă
părinte
comite
8063ea9e32

+ 1 - 1
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() {

+ 3 - 0
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();
 }

+ 1 - 0
editor/editor_resource_picker.h

@@ -127,6 +127,7 @@ public:
 	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);