Skip to content

Commit af72386

Browse files
author
Stephen Hodgson
committed
Updates the Dev branch so it can build to win standalone
1 parent e207437 commit af72386

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Assets/HoloToolkit/Utilities/Scripts/DisplayDependentObjectActivator.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using UnityEngine;
55

6-
#if UNITY_EDITOR || UNITY_WSA
6+
#if UNITY_WSA
77
using UnityEngine.XR.WSA;
88
#endif
99

@@ -17,10 +17,12 @@ public class DisplayDependentObjectActivator : MonoBehaviour
1717

1818
protected void Awake()
1919
{
20+
#if UNITY_WSA
2021
if ((HolographicSettings.IsDisplayOpaque && !OpaqueDisplay) ||
2122
(!HolographicSettings.IsDisplayOpaque && !TransparentDisplay))
2223
{
2324
gameObject.SetActive(false);
2425
}
26+
#endif
2527
}
2628
}

Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using UnityEngine;
33

4-
#if UNITY_EDITOR || UNITY_WSA
4+
#if UNITY_WSA
55
using UnityEngine.XR.WSA;
66
#endif
77

@@ -36,12 +36,14 @@ public bool Busy
3636

3737
void Start()
3838
{
39+
#if UNITY_WSA
3940
if (!HolographicSettings.IsDisplayOpaque)
4041
{
4142
GetComponentInChildren<MeshRenderer>().enabled = false;
4243
Debug.Log("Removing unnecessary full screen effect from HoloLens");
4344
return;
4445
}
46+
#endif
4547

4648
currentState = FadeState.idle;
4749
fadeMaterial = GetComponentInChildren<MeshRenderer>().material;

0 commit comments

Comments
 (0)