Fix an exception in HighlightModule that can occur if EditorXR tries …

…to set up right after a domain reload
MatthewMaker · Aug 31, 2020 · 3388fc2 · 3388fc2
1 parent 65ae164
commit 3388fc2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Runtime/Scripts/Modules/HighlightModule/HighlightModule.cs b/Runtime/Scripts/Modules/HighlightModule/HighlightModule.cs
@@ -58,7 +58,13 @@ struct HighlightData
 
         public Color highlightColor
         {
-            get { return m_RayHighlightMaterialCopy.GetVector("_Color"); }
+            get
+            {
+                if (m_RayHighlightMaterialCopy == null)
+                    return default;
+
+                return m_RayHighlightMaterialCopy.GetVector("_Color");
+            }
             set { m_RayHighlightMaterialCopy.color = value; }
         }