Merge branch 'stereo_fix' into 'master'

Fix stereo crash in the editor

Closes #7019

See merge request OpenMW/openmw!2431
coverity_clang_test
psi29a 2 years ago
commit e9cfc2381f

@ -42,11 +42,14 @@ namespace SceneUtil
{
auto stateset = getCvDependentStateset(cv);
apply(stateset, cv);
auto& sm = Stereo::Manager::instance();
if (sm.getEye(cv) == Stereo::Eye::Left)
applyLeft(stateset, cv);
if (sm.getEye(cv) == Stereo::Eye::Right)
applyRight(stateset, cv);
auto* sm = &Stereo::Manager::instance();
if (sm != nullptr)
{
if (sm->getEye(cv) == Stereo::Eye::Left)
applyLeft(stateset, cv);
if (sm->getEye(cv) == Stereo::Eye::Right)
applyRight(stateset, cv);
}
cv->pushStateSet(stateset);
traverse(node, cv);

Loading…
Cancel
Save