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

2023-09-19 21:42:53 +02:00
parent f0b5d3b838 49a6b5734a
commit a71de7357c
49 changed files with 1684 additions and 1336 deletions
--- a/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
@@ -43,7 +43,16 @@ public:
    void write(const char* message) override
    {
        String s(message);
-        s.Replace('\n', ' ');
+        if (s.Length() <= 0)
+            return;
+        for (int32 i = 0; i < s.Length(); i++)
+        {
+            Char& c = s[i];
+            if (c == '\n')
+                c = ' ';
+            else if (c >= 255)
+                c = '?';
+        }
        LOG(Info, "[Assimp]: {0}", s);
    }
 };