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
@@ -616,7 +616,7 @@ UiInteractableStateFont::FontEffectComboBoxVec UiInteractableStateFont::Populate
    // NOTE: Curently, in order for this to work, when the font is changed we need to do
    // "RefreshEntireTree" to get the combo box list refreshed.
    unsigned int numEffects = m_fontFamily ? m_fontFamily->normal->GetNumEffects() : 0;
-    for (int i = 0; i < numEffects; ++i)
+    for (unsigned int i = 0; i < numEffects; ++i)
    {
        const char* name = m_fontFamily->normal->GetEffectName(i);
        result.push_back(AZStd::make_pair(i, name));