From 622a754584d2b9442aee3d5c3835556451225262 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers
Date: Sat, 12 May 2018 16:53:45 +0200
Subject: ImageTexture.load returns an error code.

---
 scene/resources/texture.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'scene/resources/texture.cpp')

diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index c0f6756fd..56a2e7afb 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -220,12 +220,15 @@ Image::Format ImageTexture::get_format() const {
 	return format;
 }
 
-void ImageTexture::load(const String &p_path) {
+Error ImageTexture::load(const String &p_path) {
 
 	Ref<Image> img;
 	img.instance();
-	img->load(p_path);
-	create_from_image(img);
+	Error err = img->load(p_path);
+	if (err == OK) {
+		create_from_image(img);
+	}
+	return err;
 }
 
 void ImageTexture::set_data(const Ref<Image> &p_image) {
-- 
cgit v1.2.3-70-g09d2