mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-06 05:13:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix' into 'master'

Browse source 
Fix compilation error on windows: cannot convert from 'std::filesystem::path'...

See merge request OpenMW/openmw!1510
This commit is contained in:
Evil Eye 2021-12-26 18:04:21 +00:00
commit 93e355801d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/resource/scenemanager.cpp
View file

@ -481,7 +481,8 @@ namespace Resource
filePath = std::filesystem::relative(filename, osgDB::getCurrentWorkingDirectory());
try
{
return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filePath), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filePath.string()),
osgDB::ReaderWriter::ReadResult::FILE_LOADED);
}
catch (std::exception& e)
{