Merge pull request #6969 from microsoft/issue/6938

keveleigh · web-flow · commit 6c3e20f71948 · 2020-01-02T12:39:42.000-08:00
Remove if UNITY_EDITOR check
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs
@@ -458,7 +458,6 @@ private void Awake()
         }
 
         #region asset version migration
-#if UNITY_EDITOR
         private const int CurrentAssetVersion = 1;
 
         [SerializeField]
@@ -504,7 +503,6 @@ private string GetUserFriendlyName()
 
             return objectName;
         }
-#endif
         #endregion
 
     }

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,6 @@ private void Awake()`
`458`	`458`	`}`
`459`	`459`
`460`	`460`	`#region asset version migration`
`461`		`-#if UNITY_EDITOR`
`462`	`461`	`private const int CurrentAssetVersion = 1;`
`463`	`462`
`464`	`463`	`[SerializeField]`
`@@ -504,7 +503,6 @@ private string GetUserFriendlyName()`
`504`	`503`
`505`	`504`	`return objectName;`
`506`	`505`	`}`
`507`		`-#endif`
`508`	`506`	`#endregion`
`509`	`507`
`510`	`508`	`}`