Merge branch 'properly_initialize_lightsettings' into 'master'

Properly initialize light settings

See merge request OpenMW/openmw!1083

(cherry picked from commit 1f8209158baf6301048bf023651e9b38a9a099b3)

1e52ca2b properly initialize light settings
pull/593/head
psi29a 3 years ago
parent 10b799653b
commit 93f495ecb5

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

Loading…
Cancel
Save