mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-02 04:41:31 +00:00
Merge branch 'postprocessingglslversion' into 'master'
Fix post-processing shader glsl_version bumping See merge request OpenMW/openmw!4653
This commit is contained in:
commit
1f724cc336
1 changed files with 1 additions and 5 deletions
|
@ -245,11 +245,7 @@ namespace fx
|
||||||
else if (key == "author")
|
else if (key == "author")
|
||||||
mAuthor = parseString();
|
mAuthor = parseString();
|
||||||
else if (key == "glsl_version")
|
else if (key == "glsl_version")
|
||||||
{
|
mGLSLVersion = std::max(mGLSLVersion, parseInteger());
|
||||||
int version = parseInteger();
|
|
||||||
if (mUBO && version > 330)
|
|
||||||
mGLSLVersion = version;
|
|
||||||
}
|
|
||||||
else if (key == "flags")
|
else if (key == "flags")
|
||||||
mFlags = parseFlags();
|
mFlags = parseFlags();
|
||||||
else if (key == "hdr")
|
else if (key == "hdr")
|
||||||
|
|
Loading…
Reference in a new issue