Merge branch 'master' of git://github.com/Vizepi/FlaxEngine into Vizepi-master

2021-02-09 22:58:36 +01:00
parent 58350c87e2 6673d70d0a
commit cad7887957
2 changed files with 2 additions and 1 deletions
--- a/Source/Engine/Core/Config/LayersTagsSettings.h
+++ b/Source/Engine/Core/Config/LayersTagsSettings.h
@@ -3,6 +3,7 @@
 #pragma once

 #include "Engine/Core/Config/Settings.h"
+#include "Engine/Serialization/Json.h"

 /// <summary>
 /// Layers and objects tags settings.
--- a/Source/Engine/Core/Config/Settings.h
+++ b/Source/Engine/Core/Config/Settings.h
@@ -9,7 +9,7 @@
 /// <summary>
 /// Base class for all global settings containers for the engine. Helps to apply, store and expose properties to c#.
 /// </summary>
-class SettingsBase
+class FLAXENGINE_API SettingsBase
 {
 public: