diff options
| -rw-r--r-- | editor/editor_properties.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_resource_picker.cpp | 3 | ||||
| -rw-r--r-- | editor/editor_resource_picker.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index ea364d8a0d..2964fb364b 100644 --- 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 index eee589489d..9e4bf2b7d9 100644 --- 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 index 8146c02dff..333d9c9915 100644 --- a/editor/editor_resource_picker.h +++ b/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); |