diff options
| -rw-r--r-- | core/os/input_event.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/texture.cpp | 3 | ||||
| -rw-r--r-- | scene/resources/texture.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index b2febb1a63..73eaa33dbb 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -816,7 +816,7 @@ void InputEventAction::_bind_methods() { ClassDB::bind_method(D_METHOD("set_pressed", "pressed"), &InputEventAction::set_pressed); //ClassDB::bind_method(D_METHOD("is_pressed"), &InputEventAction::is_pressed); - ClassDB::bind_method(D_METHOD("is_action", "name"), &InputEventAction::is_action); + // ClassDB::bind_method(D_METHOD("is_action", "name"), &InputEventAction::is_action); ADD_PROPERTY(PropertyInfo(Variant::STRING, "action"), "set_action", "get_action"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "pressed"), "set_pressed", "is_pressed"); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 9ada68f5dc..b17192fe4f 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -3032,7 +3032,7 @@ void Tree::ensure_cursor_is_visible() { int screenh = get_size().height - h_scroll->get_combined_minimum_size().height; if (ofs + h > v_scroll->get_value() + screenh) - v_scroll->call_deferred("set_val", ofs - screenh + h); + v_scroll->call_deferred("set_value", ofs - screenh + h); else if (ofs < v_scroll->get_value()) v_scroll->set_value(ofs); } diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index ff80aa4284..6b9407be8c 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -406,7 +406,7 @@ Image::Format StreamTexture::get_format() const { return format; } -Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &flags, Ref<Image> image, int p_size_limit) { +Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &flags, Ref<Image> &image, int p_size_limit) { ERR_FAIL_COND_V(image.is_null(), ERR_INVALID_PARAMETER); @@ -502,6 +502,7 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &fla memdelete(f); ERR_FAIL_COND_V(img->empty(), ERR_FILE_CORRUPT); } + total_size += img->get_data().size(); mipmap_images.push_back(img); diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 3aa007fa00..07416529ae 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -170,7 +170,7 @@ public: }; private: - Error _load_data(const String &p_path, int &tw, int &th, int &flags, Ref<Image> image, int p_size_limit = 0); + Error _load_data(const String &p_path, int &tw, int &th, int &flags, Ref<Image> &image, int p_size_limit = 0); String path_to_file; RID texture; Image::Format format; |