diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-20 21:10:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-20 21:10:52 +0100 |
| commit | bdf0037a9c78c1a34ce9a00e8544e5aed85ad39b (patch) | |
| tree | d5be604545fc250aa089150bc9d4fc1cea4643d3 /modules/assimp/import_utils.h | |
| parent | 73323a2838f4978b1f91d7a941ac40ee17df2d34 (diff) | |
| parent | 5d70a95fe16bc213de6bb715a6e8bfae885d5ee1 (diff) | |
Merge pull request #33769 from fire/33714
33714 Crash fixes for GLTF2 and FBX
Diffstat (limited to 'modules/assimp/import_utils.h')
| -rw-r--r-- | modules/assimp/import_utils.h | 2 |
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; } |