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
@@ -191,9 +191,9 @@ void SpriteBorderEditor::UpdateSpriteSheetCellInfo(int newNumRows, int newNumCol

    // Calculate uniformly sized sprite-sheet cell UVs based on the given
    // row and column cell configuration.
-    for (int row = 0; row < m_numRows; ++row)
+    for (unsigned int row = 0; row < m_numRows; ++row)
    {
-        for (int col = 0; col < m_numCols; ++col)
+        for (unsigned int col = 0; col < m_numCols; ++col)
        {
            AZ::Vector2 min(col / floatNumCols, row / floatNumRows);
            AZ::Vector2 max((col + 1) / floatNumCols, (row + 1) / floatNumRows);