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

Source/Engine/Core/DeleteMe.h

@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include "Engine/Core/Compiler.h"
+
 /// <summary>
 /// Helper class used to delete another object.
 /// </summary>

Source/Engine/Serialization/JsonTools.h

@@ -386,6 +386,8 @@ public:
     DECLARE_GETTER(Plane);
     DECLARE_GETTER(DateTime);
 
+#undef DECLARE_GETTER
+
 #define DECLARE_GETTER(type) \
 	FORCE_INLINE static void Get##type(type& result, const Value& node, const char* name) \
 	{ \