Merge pull request #451 from Unity-Technologies/bugfixes/schoen/test-fix

Fix tests
Unity-Technologies · Dec 11, 2017 · 14f239f · 14f239f
2 parents d43614e + 61d9885
commit 14f239f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/Editor/ProxyFeedbackEditor.cs b/Editor/ProxyFeedbackEditor.cs
@@ -1,4 +1,5 @@
-using System;
+#if UNITY_2017_2_OR_NEWER
+using System;
 using System.Collections.Generic;
 using UnityEditor.Experimental.EditorVR.Modules;
 using UnityEditor.Experimental.EditorVR.Proxies;
@@ -141,3 +142,4 @@ void SaveData()
         }
     }
 }
+#endif
diff --git a/Scripts/Core/Contexts/EditingContextManager.cs b/Scripts/Core/Contexts/EditingContextManager.cs
@@ -144,20 +144,6 @@ static void OnPlayModeStateChanged(PlayModeStateChange stateChange)
             }
         }
 
-        void Awake()
-        {
-            s_DefaultContext = m_DefaultContext;
-
-            var availableContexts = GetAvailableEditingContexts();
-            m_ContextNames = availableContexts.Select(c => c.name).ToArray();
-
-            if (s_AvailableContexts.Count == 0)
-                throw new Exception("You can't start EditorXR without at least one context. Try re-importing the package or use version control to restore the default context asset");
-
-            if (s_AvailableContexts.Count > 1)
-                VRView.afterOnGUI += OnVRViewGUI;
-        }
-
         void OnEnable()
         {
             ISetEditingContextMethods.getAvailableEditingContexts = GetAvailableEditingContexts;
@@ -201,6 +187,21 @@ void OnDisable()
         }
 #endif
 
+
+        void Awake()
+        {
+            s_DefaultContext = m_DefaultContext;
+
+            var availableContexts = GetAvailableEditingContexts();
+            m_ContextNames = availableContexts.Select(c => c.name).ToArray();
+
+            if (s_AvailableContexts.Count == 0)
+                throw new Exception("You can't start EditorXR without at least one context. Try re-importing the package or use version control to restore the default context asset");
+
+            if (s_AvailableContexts.Count > 1)
+                VRView.afterOnGUI += OnVRViewGUI;
+        }
+
         void OnVRViewGUI(VRView view)
         {
             var position = view.position;