AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-24 05:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'properly_initialize_lightsettings' into 'master'

Browse Source 
Properly initialize light settings

See merge request OpenMW/openmw!1083

(cherry picked from commit 1f8209158baf6301048bf023651e9b38a9a099b3)

1e52ca2b properly initialize light settings
This commit is contained in:
psi29a 2021-08-02 07:51:53 +00:00
parent 10b799653b
commit 93f495ecb5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/sceneutil/lightmanager.cpp
View File

@ -884,8 +884,6 @@ namespace SceneUtil
std::string lightingMethodString = Settings::Manager::getString("lighting method", "Shaders"); std::string lightingMethodString = Settings::Manager::getString("lighting method", "Shaders");
auto lightingMethod = LightManager::getLightingMethodFromString(lightingMethodString); auto lightingMethod = LightManager::getLightingMethodFromString(lightingMethodString);
updateSettings();
static bool hasLoggedWarnings = false; static bool hasLoggedWarnings = false;
if (lightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings) if (lightingMethod == LightingMethod::SingleUBO && !hasLoggedWarnings)
@ -904,6 +902,8 @@ namespace SceneUtil
else else
initSingleUBO(targetLights); initSingleUBO(targetLights);
updateSettings();
getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0)); getOrCreateStateSet()->addUniform(new osg::Uniform("PointLightCount", 0));
addCullCallback(new LightManagerCullCallback(this)); addCullCallback(new LightManagerCullCallback(this));