Skip to content

Commit 4eda5a1

Browse files
committed
Remove stale comment and update another usage of legacy XR to remove pragma
1 parent e00b7c6 commit 4eda5a1

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Assets/MixedRealityToolkit/Utilities/Editor/Setup/MixedRealityProjectConfigurator.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ public bool IsActiveBuildTargetValid()
9999
{ Configurations.LatestScriptingRuntime, new ConfigGetter(() => { return IsLatestScriptingRuntime(); }) },
100100
{ Configurations.ForceTextSerialization, new ConfigGetter(() => { return IsForceTextSerialization(); }) },
101101
{ Configurations.VisibleMetaFiles, new ConfigGetter(() => { return IsVisibleMetaFiles(); }) },
102-
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
103-
// with legacy requirements.
104102
{ Configurations.VirtualRealitySupported, new ConfigGetter(() => { return XRSettingsUtilities.LegacyXREnabled; }) },
105103
{ Configurations.SinglePassInstancing, new ConfigGetter(() => { return MixedRealityOptimizeUtils.IsSinglePassInstanced(); }) },
106104
{ Configurations.SpatialAwarenessLayer, new ConfigGetter(() => { return HasSpatialAwarenessLayer(); }) },
@@ -132,16 +130,12 @@ public bool IsActiveBuildTargetValid()
132130
};
133131

134132
// The configure functions for each type of setting
135-
private static Dictionary<Configurations, Action> ConfigurationSetters = new Dictionary<Configurations, Action>()
133+
private static readonly Dictionary<Configurations, Action> ConfigurationSetters = new Dictionary<Configurations, Action>()
136134
{
137135
{ Configurations.LatestScriptingRuntime, () => { SetLatestScriptingRuntime(); } },
138136
{ Configurations.ForceTextSerialization, () => { SetForceTextSerialization(); } },
139137
{ Configurations.VisibleMetaFiles, () => { SetVisibleMetaFiles(); } },
140-
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
141-
// with legacy requirements.
142-
#pragma warning disable 0618
143-
{ Configurations.VirtualRealitySupported, () => { PlayerSettings.virtualRealitySupported = true; } },
144-
#pragma warning restore 0618
138+
{ Configurations.VirtualRealitySupported, () => { XRSettingsUtilities.LegacyXREnabled = true; } },
145139
{ Configurations.SinglePassInstancing, () => { MixedRealityOptimizeUtils.SetSinglePassInstanced(); } },
146140
{ Configurations.SpatialAwarenessLayer, () => { SetSpatialAwarenessLayer(); } },
147141
{ Configurations.EnableMSBuildForUnity, () => { PackageManifestUpdater.EnsureMSBuildForUnity(); } },

0 commit comments

Comments
 (0)