mirror of
https://github.com/OpenMW/openmw.git
synced 2025-12-13 16:43:07 +00:00
Merge branch 'dontreplacedepth' into 'master'
Don't run osg::Depth replacement visitor for NIF templates See merge request OpenMW/openmw!4876
This commit is contained in:
commit
944925663d
1 changed files with 4 additions and 3 deletions
|
|
@ -700,6 +700,10 @@ namespace Resource
|
||||||
node->accept(renamingVisitor);
|
node->accept(renamingVisitor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Replace osg::Depth with reverse-Z-compatible SceneUtil::AutoDepth
|
||||||
|
SceneUtil::ReplaceDepthVisitor replaceDepthVisitor;
|
||||||
|
node->accept(replaceDepthVisitor);
|
||||||
|
|
||||||
for (osg::Node* foundRigNode : rigFinder.mFoundNodes)
|
for (osg::Node* foundRigNode : rigFinder.mFoundNodes)
|
||||||
{
|
{
|
||||||
if (foundRigNode->libraryName() == std::string_view("osgAnimation"))
|
if (foundRigNode->libraryName() == std::string_view("osgAnimation"))
|
||||||
|
|
@ -1015,9 +1019,6 @@ namespace Resource
|
||||||
mMinFilter, mMagFilter, mMaxAnisotropy);
|
mMinFilter, mMagFilter, mMaxAnisotropy);
|
||||||
loaded->accept(setFilterSettingsControllerVisitor);
|
loaded->accept(setFilterSettingsControllerVisitor);
|
||||||
|
|
||||||
SceneUtil::ReplaceDepthVisitor replaceDepthVisitor;
|
|
||||||
loaded->accept(replaceDepthVisitor);
|
|
||||||
|
|
||||||
osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor());
|
osg::ref_ptr<Shader::ShaderVisitor> shaderVisitor(createShaderVisitor());
|
||||||
loaded->accept(*shaderVisitor);
|
loaded->accept(*shaderVisitor);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue