From 4b63250bc734be4ac3413d2c91518cb1a8861bbf Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 17 Jun 2022 10:17:05 +0200 Subject: [PATCH] Fix bindings in ImagePickerButton, and load the image properly. --- .../widgets/image_picker_button/image_picker_button.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp b/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp index 10d179087..19c981fa4 100644 --- a/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp +++ b/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp @@ -2,6 +2,7 @@ #include "image_picker_button.h" #include "../file_dialog/mat_maker_file_dialog.h" +#include "core/io/image_loader.h" #include "core/io/resource_loader.h" #include "scene/resources/texture.h" @@ -23,7 +24,9 @@ void ImagePickerButton::do_set_image_path(const String &path) { image_path = path; - Ref img = ResourceLoader::load("image_path", "Image"); + Ref img; + img.instance(); + ImageLoader::load_image(image_path, img); Ref tex = get_normal_texture(); if (!tex.is_valid()) { @@ -108,7 +111,6 @@ void ImagePickerButton::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::STRING, "image_path"), "set_image_path", "get_image_path"); ClassDB::bind_method(D_METHOD("do_set_image_path", "path"), &ImagePickerButton::do_set_image_path); - ClassDB::bind_method(D_METHOD("set_image_path", "path"), &ImagePickerButton::set_image_path); ClassDB::bind_method(D_METHOD("_on_ImagePicker_pressed"), &ImagePickerButton::_on_ImagePicker_pressed); ClassDB::bind_method(D_METHOD("on_drop_image_file", "file_name"), &ImagePickerButton::on_drop_image_file); ClassDB::bind_method(D_METHOD("on_file_selected", "files"), &ImagePickerButton::on_file_selected);