Merge remote-tracking branch 'origin/master' into 1.12

# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GUI.flax
#	Flax.flaxproj
#	Source/Editor/Windows/AboutDialog.cs
#	Source/Engine/Serialization/Stream.cpp
#	Source/Shaders/GUICommon.hlsl

Source/Engine/Serialization/ISerializeModifier.h

@@ -4,7 +4,6 @@
 
 #include "Engine/Core/Collections/Dictionary.h"
 #include "Engine/Core/Types/Guid.h"
-#include "FlaxEngine.Gen.h"
 
 /// <summary>
 /// Object serialization modification base class. Allows to extend the serialization process by custom effects like object ids mapping.
@@ -12,17 +11,18 @@
 class FLAXENGINE_API ISerializeModifier
 {
 public:
-
     /// <summary>
     /// Number of engine build when data was serialized. Useful to upgrade data from the older storage format.
     /// </summary>
-    uint32 EngineBuild = FLAXENGINE_VERSION_BUILD;
+    uint32 EngineBuild;
 
     // Utility for scene deserialization to track currently mapped in Prefab Instance object IDs into IdsMapping.
-    int32 CurrentInstance = -1;
+    int32 CurrentInstance;
 
     /// <summary>
     /// The object IDs mapping. Key is a serialized object id, value is mapped value to use.
     /// </summary>
     Dictionary<Guid, Guid> IdsMapping;
+
+    ISerializeModifier();
 };

Source/Engine/Serialization/Serialization.cpp

@@ -25,6 +25,13 @@
 #include "Engine/Content/Asset.h"
 #include "Engine/Level/SceneObject.h"
 #include "Engine/Utilities/Encryption.h"
+#include "FlaxEngine.Gen.h"
+
+ISerializeModifier::ISerializeModifier()
+{
+    EngineBuild = FLAXENGINE_VERSION_BUILD;
+    CurrentInstance = -1;
+}
 
 void ISerializable::DeserializeIfExists(DeserializeStream& stream, const char* memberName, ISerializeModifier* modifier)
 {

Source/Engine/Serialization/Stream.cpp

@@ -5,6 +5,7 @@
 #include "JsonWriters.h"
 #include "JsonSerializer.h"
 #include "MemoryReadStream.h"
+#include "FlaxEngine.Gen.h"
 #include "Engine/Core/Types/Variant.h"
 #include "Engine/Core/Collections/Dictionary.h"
 #include "Engine/Core/Math/Vector2.h"