openmw-38
scrawl 9 years ago
parent e62470d674
commit 83e9a649e5

@ -114,7 +114,6 @@ osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::
{ {
Files::IStreamPtr file = mVFS->get(normalized); Files::IStreamPtr file = mVFS->get(normalized);
// TODO: add support for non-NIF formats
size_t extPos = normalized.find_last_of('.'); size_t extPos = normalized.find_last_of('.');
std::string ext; std::string ext;
if (extPos != std::string::npos && extPos+1 < normalized.size()) if (extPos != std::string::npos && extPos+1 < normalized.size())

@ -130,7 +130,6 @@ namespace Resource
{ {
try try
{ {
mTextureManager->getTexture2D(filename, osg::Texture::CLAMP_TO_EDGE, osg::Texture::CLAMP_TO_EDGE);
return osgDB::ReaderWriter::ReadResult(mTextureManager->getImage(filename), osgDB::ReaderWriter::ReadResult::FILE_LOADED); return osgDB::ReaderWriter::ReadResult(mTextureManager->getImage(filename), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
} }
catch (std::exception& e) catch (std::exception& e)

Loading…
Cancel
Save