summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2019-11-20 11:22:27 -0800
committerK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2019-11-20 11:22:35 -0800
commit5d70a95fe16bc213de6bb715a6e8bfae885d5ee1 (patch)
treed5be604545fc250aa089150bc9d4fc1cea4643d3
parent3b44866bf2e3be0870df9cbe377afe811f06071c (diff)
33714 Check if the image is null before use.
-rw-r--r--modules/assimp/import_utils.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/assimp/import_utils.h b/modules/assimp/import_utils.h
index 7b14804ddc..8135b352c6 100644
--- a/modules/assimp/import_utils.h
+++ b/modules/assimp/import_utils.h
@@ -394,7 +394,9 @@ public:
return Ref<Image>();
} else {
Ref<Texture> texture = ResourceLoader::load(p_path);
+ ERR_FAIL_COND_V(texture.is_null(), Ref<Image>());
Ref<Image> image = texture->get_data();
+ ERR_FAIL_COND_V(image.is_null(), Ref<Image>());
state.path_to_image_cache.insert(p_path, image);
return image;
}