ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash if missing texture image

Browse Source
This commit is contained in:
Benau 2018-01-18 12:45:04 +08:00
parent 0d74b1739b
commit 8a5994b9e3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/graphics/sp/sp_texture.cpp
View File

@ -121,6 +121,7 @@ std::shared_ptr<video::IImage> SPTexture::getImageFromPath
if (img_loader == NULL) if (img_loader == NULL)
{ {
Log::error("SPTexture", "No image loader for %s", path.c_str()); Log::error("SPTexture", "No image loader for %s", path.c_str());
return NULL;
} }
io::IReadFile* file = irr::io::createReadFile(path.c_str()); io::IReadFile* file = irr::io::createReadFile(path.c_str());
@ -440,17 +441,19 @@ bool SPTexture::threadedLoad()
} }
std::shared_ptr<video::IImage> image = getTextureImage(); std::shared_ptr<video::IImage> image = getTextureImage();
if (!image)
{
return true;
}
std::shared_ptr<video::IImage> mask = getMask(image->getDimension()); std::shared_ptr<video::IImage> mask = getMask(image->getDimension());
if (mask && image) if (mask)
{ {
applyMask(image.get(), mask.get()); applyMask(image.get(), mask.get());
} }
std::shared_ptr<video::IImage> mipmaps; std::shared_ptr<video::IImage> mipmaps;
if (!m_cache_directory.empty() && if (!m_cache_directory.empty() && CVS->isTextureCompressionEnabled() &&
CVS->isTextureCompressionEnabled() && image && image->getDimension().Width >= 4 && image->getDimension().Height >= 4)
image->getDimension().Width >= 4 &&
image->getDimension().Height >= 4)
{ {
auto r = compressTexture(image); auto r = compressTexture(image);
SPTextureManager::get()->increaseGLCommandFunctionCount(1); SPTextureManager::get()->increaseGLCommandFunctionCount(1);
@ -469,8 +472,7 @@ bool SPTexture::threadedLoad()
else else
{ {
#ifndef USE_GLES2 #ifndef USE_GLES2
if (UserConfigParams::m_hq_mipmap && image && if (UserConfigParams::m_hq_mipmap && image->getDimension().Width > 1 &&
image->getDimension().Width > 1 &&
image->getDimension().Height > 1) image->getDimension().Height > 1)
{ {
std::vector<std::pair<core::dimension2du, unsigned> > std::vector<std::pair<core::dimension2du, unsigned> >