Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-03 07:17:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

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

Browse source
This commit is contained in:
Petr Mikheev 2021-12-26 18:04:20 +00:00 • committed by Evil Eye
parent d16819a5b0
commit 7fe5351f55
1 changed files with 2 additions and 1 deletions
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()); filePath = std::filesystem::relative(filename, osgDB::getCurrentWorkingDirectory());
try 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) catch (std::exception& e)
{ {