Skip to content

Commit 8063ea9

Browse files
committed
Merge pull request #84446 from KoBeWi/EditorYOLOPicker
Don't check resource type assigned in property
2 parents caca54a + 0f755ce commit 8063ea9

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

editor/editor_properties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3408,7 +3408,7 @@ void EditorPropertyResource::update_property() {
34083408
}
34093409
}
34103410

3411-
resource_picker->set_edited_resource(res);
3411+
resource_picker->set_edited_resource_no_check(res);
34123412
}
34133413

34143414
void EditorPropertyResource::collapse_all_folding() {

editor/editor_resource_picker.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,10 @@ void EditorResourcePicker::set_edited_resource(Ref<Resource> p_resource) {
896896
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));
897897
}
898898
}
899+
set_edited_resource_no_check(p_resource);
900+
}
899901

902+
void EditorResourcePicker::set_edited_resource_no_check(Ref<Resource> p_resource) {
900903
edited_resource = p_resource;
901904
_update_resource();
902905
}

editor/editor_resource_picker.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ class EditorResourcePicker : public HBoxContainer {
127127
Vector<String> get_allowed_types() const;
128128

129129
void set_edited_resource(Ref<Resource> p_resource);
130+
void set_edited_resource_no_check(Ref<Resource> p_resource);
130131
Ref<Resource> get_edited_resource();
131132

132133
void set_toggle_mode(bool p_enable);

0 commit comments

Comments
 (0)