mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 00:09:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'wrong_maski' into 'master'

Browse source 
[Postprocessing] Use correct indexed color mask

See merge request OpenMW/openmw!2230
This commit is contained in:
psi29a 2022-08-01 16:47:10 +00:00
commit 44339889dd
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/shader/shadervisitor.cpp
View file

@ -12,7 +12,7 @@
#include <osg/Multisample> #include <osg/Multisample>
#include <osg/Texture> #include <osg/Texture>
#include <osg/ValueObject> #include <osg/ValueObject>
#include <osg/Capability> #include <osg/ColorMaski>
#include <osgParticle/ParticleSystem> #include <osgParticle/ParticleSystem>
@ -636,8 +636,7 @@ namespace Shader
{ {
if (reqs.mSoftParticles) if (reqs.mSoftParticles)
defineMap["disableNormals"] = "1"; defineMap["disableNormals"] = "1";
else writableStateSet->setAttribute(new osg::ColorMaski(1, false, false, false, false));
writableStateSet->setAttribute(new osg::Disablei(GL_BLEND, 1));
} }
if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT && !previousAddedState->hasMode(GL_ALPHA_TEST)) if (writableStateSet->getMode(GL_ALPHA_TEST) != osg::StateAttribute::INHERIT && !previousAddedState->hasMode(GL_ALPHA_TEST))