Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-29 07:07:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bindings in ImagePickerButton, and load the image properly.

Browse Source
This commit is contained in:
Relintai 2022-06-17 10:17:05 +02:00
parent a4d5219e26
commit 4b63250bc7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp
View File

@ -2,6 +2,7 @@
#include "image_picker_button.h" #include "image_picker_button.h"
#include "../file_dialog/mat_maker_file_dialog.h" #include "../file_dialog/mat_maker_file_dialog.h"
#include "core/io/image_loader.h"
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
@ -23,7 +24,9 @@ void ImagePickerButton::do_set_image_path(const String &path) {
image_path = path; image_path = path;
Ref<Image> img = ResourceLoader::load("image_path", "Image"); Ref<Image> img;
img.instance();
ImageLoader::load_image(image_path, img);
Ref<ImageTexture> tex = get_normal_texture(); Ref<ImageTexture> tex = get_normal_texture();
if (!tex.is_valid()) { 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"); 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("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_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_drop_image_file", "file_name"), &ImagePickerButton::on_drop_image_file);
ClassDB::bind_method(D_METHOD("on_file_selected", "files"), &ImagePickerButton::on_file_selected); ClassDB::bind_method(D_METHOD("on_file_selected", "files"), &ImagePickerButton::on_file_selected);