mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-30 03:15:32 +00:00
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
This commit is contained in:
parent
10b799653b
commit
93f495ecb5
1 changed files with 2 additions and 2 deletions
|
@ -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…
Reference in a new issue