Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay

2021-05-12 11:55:51 -07:00
parent 6fcd5c7817 33f7da764e
commit 559798251d
1514 changed files with 30767 additions and 174001 deletions
@@ -1233,7 +1233,8 @@ void AZ::FFont::WrapText(string& result, float maxWidth, const char* str, const

    if (ctx.m_sizeIn800x600)
    {
-        maxWidth = gEnv->pRenderer->ScaleCoordX(maxWidth);
+        // ToDo: Update to work with Atom? LYN-3676
+        // maxWidth = ???->ScaleCoordX(maxWidth);
    }

    Vec2 strSize = GetTextSize(result.c_str(), true, ctx);