1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00

Merge branch 'stereo_fix' into 'master'

Fix stereo crash in the editor

Closes #7019

See merge request OpenMW/openmw!2431
This commit is contained in:
psi29a 2022-09-25 13:32:43 +00:00
commit e9cfc2381f

View File

@ -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);