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

# Conflicts: # Source/Platforms/DotNet/Newtonsoft.Json.dll # Source/Platforms/DotNet/Newtonsoft.Json.pdb # Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll # Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll
2021-04-22 16:10:36 +02:00
parent c23d2ad2c4 d11a9d4d8f
commit ace8295ab7
37 changed files with 736 additions and 163 deletions
--- a/Source/Engine/ContentImporters/CreateJson.cpp
+++ b/Source/Engine/ContentImporters/CreateJson.cpp
@@ -44,6 +44,18 @@ bool CreateJson::Create(const StringView& path, StringAnsiView& data, StringAnsi
            LOG(Warning, "Asset will have different type name {0} -> {1}", typeName, String(dataTypename.Get()));
        }
    }
+    else
+    {
+        const String directory = StringUtils::GetDirectoryName(path);
+        if (!FileSystem::DirectoryExists(directory))
+        {
+            if (FileSystem::CreateDirectory(directory))
+            {
+                LOG(Warning, "Failed to create directory");
+                return true;
+            }
+        }   
+    }

    rapidjson_flax::StringBuffer buffer;