AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-08-04 07:46:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stereo_fix' into 'master'

Browse Source 
Fix stereo crash in the editor

Closes #7019

See merge request OpenMW/openmw!2431

(cherry picked from commit e9cfc2381fb949e427901463225ac21cef279fbc)

890be1b5 Fix crash in the editor
This commit is contained in:
psi29a 2022-09-25 13:32:43 +00:00
parent 779ec6e55c
commit 7b3adff1c5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/sceneutil/statesetupdater.cpp
View File

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