diff options
| author | Evil Eye <malusluminis@hotmail.com> | 2021-12-26 18:04:21 +0000 |
|---|---|---|
| committer | Evil Eye <malusluminis@hotmail.com> | 2021-12-26 18:04:21 +0000 |
| commit | 93e355801d90e94921b050576842675931679a32 (patch) | |
| tree | e64ff7bb6fe887f9b750b16e53f474a2efd99686 | |
| parent | ea5bd822c261d3d2e4f48ee243f5e99065a49988 (diff) | |
| parent | 7fe5351f55454dd39c0fc02f21fa1fc141cb99ee (diff) | |
Merge branch 'fix' into 'master'
Fix compilation error on windows: cannot convert from 'std::filesystem::path'...
See merge request OpenMW/openmw!1510
| -rw-r--r-- | components/resource/scenemanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp index 72349dadb1..4f0658e033 100644 --- a/components/resource/scenemanager.cpp +++ b/components/resource/scenemanager.cpp @@ -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) { |