Post merge fixes and cleanup

#571
This commit is contained in:
Wojtek Figat
2021-08-26 17:27:38 +02:00
parent 87a08a7db6
commit d9410f9cdd
14 changed files with 59 additions and 67 deletions

View File

@@ -1,4 +1 @@
#pragma once
#define COMPILE_WITH_DEV_ENV 0
#define OFFICIAL_BUILD 1

View File

@@ -138,7 +138,7 @@ namespace FlaxEditor.Content.Settings
#if FLAX_EDITOR || PLATFORM_XBOX_ONE
/// <summary>
/// Reference to Xbox One Platform Settings asset. Used to apply configuration on Xbox ScOnearlett platform.
/// Reference to Xbox One Platform Settings asset. Used to apply configuration on Xbox One platform.
/// </summary>
[EditorOrder(2050), EditorDisplay("Platform Settings", "Xbox One"), AssetReference(XboxOnePlatformSettingsTypename, true), Tooltip("Reference to Xbox One Platform Settings asset")]
public JsonAsset XboxOnePlatform;