mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 18:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix #6502

Browse Source
This commit is contained in:
Petr Mikheev 2021-12-18 17:04:55 +01:00
parent 826553f2be
commit b06248a31f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/resource/scenemanager.cpp
View File

@ -1,6 +1,7 @@
#include "scenemanager.hpp"
#include <cstdlib>
#include <filesystem>
#include <osg/AlphaFunc>
#include <osg/Node>
@ -10,6 +11,7 @@
#include <osgUtil/IncrementalCompileOperation>
#include <osgDB/FileUtils>
#include <osgDB/SharedStateManager>
#include <osgDB/Registry>
@ -472,9 +474,14 @@ namespace Resource
osgDB::ReaderWriter::ReadResult readImage(const std::string& filename, const osgDB::Options* options) override
{
std::filesystem::path filePath(filename);
if (filePath.is_absolute())
// It is a hack. Needed because either OSG or libcollada-dom tries to make an absolute path from
// our relative VFS path by adding current working directory.
filePath = std::filesystem::relative(filename, osgDB::getCurrentWorkingDirectory());
try
{
return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filename), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filePath), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
}
catch (std::exception& e)
{