From 607afeee5009140fd30f7222fc6ca77c1cfb8672 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 12 Oct 2022 20:38:59 +0200 Subject: [PATCH] Add proper deserialization of old values pre-renaming #767 --- Source/Engine/Core/Config/GraphicsSettings.h | 15 +++++++++++++++ Source/Engine/Platform/SettingsBase.cs | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Source/Engine/Core/Config/GraphicsSettings.h b/Source/Engine/Core/Config/GraphicsSettings.h index 5cb2c923c..8099e8437 100644 --- a/Source/Engine/Core/Config/GraphicsSettings.h +++ b/Source/Engine/Core/Config/GraphicsSettings.h @@ -119,6 +119,21 @@ public: API_FIELD(Attributes="EditorOrder(10000), EditorDisplay(\"Post Process Settings\", EditorDisplayAttribute.InlineStyle)") PostProcessSettings PostProcessSettings; +private: + /// + /// Renamed UeeHDRProbes into UseHDRProbes + /// [Deprecated on 12.10.2022, expires on 12.10.2024] + /// + API_PROPERTY(Attributes="Serialize, Obsolete, NoUndo") bool GetUeeHDRProbes() const + { + return UseHDRProbes; + } + + API_PROPERTY(Attributes="Serialize, Obsolete, NoUndo") void SetUeeHDRProbes(bool value) + { + UseHDRProbes = value; + } + public: /// /// Gets the instance of the settings asset (default value if missing). Object returned by this method is always loaded with valid data to use. diff --git a/Source/Engine/Platform/SettingsBase.cs b/Source/Engine/Platform/SettingsBase.cs index 505195819..ab25592a5 100644 --- a/Source/Engine/Platform/SettingsBase.cs +++ b/Source/Engine/Platform/SettingsBase.cs @@ -1,5 +1,8 @@ // Copyright (c) 2012-2022 Wojciech Figat. All rights reserved. +using System; +using FlaxEngine; + namespace FlaxEditor.Content.Settings { /// @@ -11,13 +14,24 @@ namespace FlaxEditor.Content.Settings partial class GraphicsSettings { + /// + /// Renamed UeeHDRProbes into UseHDRProbes + /// [Deprecated on 12.10.2022, expires on 12.10.2024] + /// + [Serialize, Obsolete, NoUndo] + private bool UeeHDRProbes + { + get => UseHDRProbes; + set => UseHDRProbes = value; + } + /// /// Initializes a new instance of the . /// public GraphicsSettings() { // Initialize PostFx settings with default options (C# structs don't support it) - PostProcessSettings = FlaxEngine.PostProcessSettings.Default; + PostProcessSettings = PostProcessSettings.Default; } } }