3 files changed, 42 insertions, 0 deletions
diff --git a/core/image.cpp b/core/image.cpp
index 422c0e407b..ba6848eecf 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -2287,6 +2287,9 @@ void Image::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_pixel", "x", "y", "color"), &Image::set_pixel);
 	ClassDB::bind_method(D_METHOD("get_pixel", "x", "y"), &Image::get_pixel);
 
+	ClassDB::bind_method(D_METHOD("load_png_from_buffer", "buffer"), &Image::load_png_from_buffer);
+	ClassDB::bind_method(D_METHOD("load_jpg_from_buffer", "buffer"), &Image::load_jpg_from_buffer);
+
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "_set_data", "_get_data");
 
 	BIND_ENUM_CONSTANT(FORMAT_L8); //luminance
@@ -2505,6 +2508,40 @@ String Image::get_format_name(Format p_format) {
 	return format_names[p_format];
 }
 
+Error Image::load_png_from_buffer(const PoolVector<uint8_t> &p_array) {
+
+	int buffer_size = p_array.size();
+
+	ERR_FAIL_COND_V(buffer_size == 0, ERR_INVALID_PARAMETER);
+	ERR_FAIL_COND_V(!_png_mem_loader_func, ERR_INVALID_PARAMETER);
+
+	PoolVector<uint8_t>::Read r = p_array.read();
+
+	Ref<Image> image = _png_mem_loader_func(r.ptr(), buffer_size);
+	ERR_FAIL_COND_V(!image.is_valid(), ERR_PARSE_ERROR);
+
+	copy_internals_from(image);
+
+	return OK;
+}
+
+Error Image::load_jpg_from_buffer(const PoolVector<uint8_t> &p_array) {
+
+	int buffer_size = p_array.size();
+
+	ERR_FAIL_COND_V(buffer_size == 0, ERR_INVALID_PARAMETER);
+	ERR_FAIL_COND_V(!_jpg_mem_loader_func, ERR_INVALID_PARAMETER);
+
+	PoolVector<uint8_t>::Read r = p_array.read();
+
+	Ref<Image> image = _jpg_mem_loader_func(r.ptr(), buffer_size);
+	ERR_FAIL_COND_V(!image.is_valid(), ERR_PARSE_ERROR);
+
+	copy_internals_from(image);
+
+	return OK;
+}
+
 Image::Image(const uint8_t *p_mem_png_jpg, int p_len) {
 
 	width = 0;
diff --git a/core/image.h b/core/image.h
index 24693aa706..cf7632a1f1 100644
--- a/core/image.h
+++ b/core/image.h
@@ -296,6 +296,9 @@ public:
 	static void set_compress_bc_func(void (*p_compress_func)(Image *, CompressSource));
 	static String get_format_name(Format p_format);
 
+	Error load_png_from_buffer(const PoolVector<uint8_t> &p_array);
+	Error load_jpg_from_buffer(const PoolVector<uint8_t> &p_array);
+
 	Image(const uint8_t *p_mem_png_jpg, int p_len = -1);
 	Image(const char **p_xpm);
 
diff --git a/core/script_language.cpp b/core/script_language.cpp
index c1e9d55872..2c32054e77 100644
--- a/core/script_language.cpp
+++ b/core/script_language.cpp
@@ -54,6 +54,8 @@ void Script::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_source_code"), &Script::get_source_code);
 	ClassDB::bind_method(D_METHOD("set_source_code", "source"), &Script::set_source_code);
 	ClassDB::bind_method(D_METHOD("reload", "keep_state"), &Script::reload, DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("get_base_script"), &Script::get_base_script);
+	ClassDB::bind_method(D_METHOD("get_instance_base_type"), &Script::get_instance_base_type);
 
 	ClassDB::bind_method(D_METHOD("has_script_signal", "signal_name"), &Script::has_script_signal);