a few more replacements for the editor declaration

Author: Stephen Hodgson

Assets/HoloToolkit/SharingWithUNET/UI/Scripts/StartSessionButton.cs

@@ -19,13 +19,11 @@ public class StartSessionButton : MonoBehaviour, IInputClickHandler
         void Start()
         {
             networkDiscovery = NetworkDiscoveryWithAnchors.Instance;
-#if !UNITY_EDITOR
-            if (UnityEngine.XR.WSA.HolographicSettings.IsDisplayOpaque)
+            if (UnityEngine.XR.WSA.HolographicSettings.IsDisplayOpaque && !Application.isEditor)
             {
                 Debug.Log("Only hololens can host for now");
                 Destroy(this.gameObject);
             }
-#endif
         }
 
         /// <summary>
@@ -39,12 +37,13 @@ public void OnInputClicked(InputClickedEventData eventData)
                 // Only let hololens host
                 // We are also allowing the editor to host for testing purposes, but shared anchors
                 // will currently not work in this mode.
-#if !UNITY_EDITOR
-                if (!UnityEngine.XR.WSA.HolographicSettings.IsDisplayOpaque)
-#else
-                Debug.Log("Unity editor can host, but World Anchors will not be shared");
-#endif
+                if (!UnityEngine.XR.WSA.HolographicSettings.IsDisplayOpaque || Application.isEditor)
                 {
+                    if (Application.isEditor)
+                    {
+                        Debug.Log("Unity editor can host, but World Anchors will not be shared");
+                    }
+
                     networkDiscovery.StartHosting("DefaultName");
                     eventData.Use();
                 }

Assets/HoloToolkit/SpatialMapping/Scripts/ObjectSurfaceObserver.cs

@@ -13,11 +13,9 @@ public class ObjectSurfaceObserver : SpatialMappingSource
         [Tooltip("If greater than or equal to zero, surface objects will claim to be updated at this period. This is useful when working with libraries that respond to updates (such as the SpatialUnderstanding library). If negative, surfaces will not claim to be updated.")]
         public float SimulatedUpdatePeriodInSeconds = -1;
 
-        // Use this for initialization.
         private void Start()
         {
-#if UNITY_EDITOR
-            if (!UnityEngine.XR.XRDevice.isPresent)
+            if (!UnityEngine.XR.XRDevice.isPresent && Application.isEditor)
             {
                 // When in the Unity editor and not remoting, try loading saved meshes from a model.
                 Load(RoomModel);
@@ -27,7 +25,6 @@ private void Start()
                     SpatialMappingManager.Instance.SetSpatialMappingSource(this);
                 }
             }
-#endif
         }
 
         /// <summary>