mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-15 18:39:51 +00:00
Merge branch 'luaui_noerror' into 'master'
Lua UI API: Let image manager handle missing textures See merge request OpenMW/openmw!1722
This commit is contained in:
commit
593a16737c
@ -7,15 +7,9 @@ namespace LuaUi
|
||||
{
|
||||
std::shared_ptr<TextureResource> ResourceManager::registerTexture(TextureData data)
|
||||
{
|
||||
std::string normalizedPath = mVfs->normalizeFilename(data.mPath);
|
||||
if (!mVfs->exists(normalizedPath))
|
||||
{
|
||||
auto error = Misc::StringUtils::format("Texture with path \"%s\" doesn't exist", data.mPath);
|
||||
throw std::logic_error(error);
|
||||
}
|
||||
data.mPath = normalizedPath;
|
||||
|
||||
TextureResources& list = mTextures[normalizedPath];
|
||||
data.mPath = mVfs->normalizeFilename(data.mPath);
|
||||
|
||||
TextureResources& list = mTextures[data.mPath];
|
||||
list.push_back(std::make_shared<TextureResource>(data));
|
||||
return list.back();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user