Merge branch 'FlaxEngine:master' into fix/nullable

Source/Engine/Platform/Defines.h

@@ -186,8 +186,8 @@ API_ENUM() enum class ArchitectureType
 #ifndef PLATFORM_ARCH_ARM64
 #define PLATFORM_ARCH_ARM64 0
 #endif
-#ifndef PLATFORM_WCHAR_IS_CHAR16
-#define PLATFORM_WCHAR_IS_CHAR16 0
+#ifndef PLATFORM_TEXT_IS_CHAR16
+#define PLATFORM_TEXT_IS_CHAR16 0
 #endif
 #ifndef PLATFORM_DEBUG_BREAK
 #define PLATFORM_DEBUG_BREAK

Source/Engine/Platform/StringUtils.h

@@ -224,7 +224,7 @@ public:
     template<typename T>
     static bool ParseHex(const T* str, uint32* result)
     {
-        return StringUtils::ParseHex(str, StringUtils::Length((const T*)str), result);
+        return StringUtils::ParseHex(str, StringUtils::Length(str), result);
     }
 
     // Parses text to the unsigned integer value. Returns true if failed to convert the value.
@@ -321,7 +321,7 @@ public:
     template<typename T, typename U>
     static bool Parse(const T* str, U* result)
     {
-        return StringUtils::Parse((const T*)str, StringUtils::Length((const T*)str), (U*)result);
+        return StringUtils::Parse(str, StringUtils::Length(str), result);
     }
 
     // Parses text to the scalar value. Returns true if failed to convert the value.

Source/Engine/Tools/TextureTool/TextureTool.stb.cpp

@@ -539,17 +539,17 @@ bool TextureTool::ImportTextureStb(ImageType type, const StringView& path, Textu
     if (options.FlipX)
     {
         // TODO: impl this
-        LOG(Warning "Option 'Flip X' is not supported");
+        LOG(Warning, "Option 'Flip X' is not supported");
     }
     if (options.InvertGreenChannel)
     {
         // TODO: impl this
-        LOG(Warning "Option 'Invert Green Channel' is not supported");
+        LOG(Warning, "Option 'Invert Green Channel' is not supported");
     }
     if (options.ReconstructZChannel)
     {
         // TODO: impl this
-        LOG(Warning "Option 'Reconstruct Z Channel' is not supported");
+        LOG(Warning, "Option 'Reconstruct Z Channel' is not supported");
     }
 
     // Generate mip maps chain