From 7b3adff1c5d8caecdb321d82b2d05906eb79f96c Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Sun, 25 Sep 2022 13:32:43 +0000
Subject: [PATCH] Merge branch 'stereo_fix' into 'master'

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
---
 components/sceneutil/statesetupdater.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/sceneutil/statesetupdater.cpp b/components/sceneutil/statesetupdater.cpp
index 9778cf4852..63b4229e0c 100644
--- a/components/sceneutil/statesetupdater.cpp
+++ b/components/sceneutil/statesetupdater.cpp
@@ -40,11 +40,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);