Merge branch 'development' into cmake/SPEC-7484

2021-08-10 14:30:07 -07:00
parent 3b9044ce5d c484e685d1
commit 2147b1d128
153 changed files with 5217 additions and 2016 deletions
@@ -3531,7 +3531,7 @@ UiTextComponent::FontEffectComboBoxVec UiTextComponent::PopulateFontEffectList()
    if (m_font)
    {
        unsigned int numEffects = m_font->GetNumEffects();
-        for (int i = 0; i < numEffects; ++i)
+        for (unsigned int i = 0; i < numEffects; ++i)
        {
            const char* name = m_font->GetEffectName(i);
            result.push_back(AZStd::make_pair(i, name));