birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
This commit is contained in:
Esteban Papp
2021-08-05 20:05:25 -07:00
parent 4358b6eb27 6b2452379f
commit e28d04aea6
389 changed files with 5267 additions and 3581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp
+2 -2
View File
@@ -286,8 +286,8 @@ void SpriteBorderEditor::AddConfigureSection(QGridLayout* gridLayout, int& rowNu
// Count the number of unique entries along each axis to determine number
// of rows/cols contained within the spritesheet.
m_numRows = vSet.size() > 1 ? vSet.size() - 1 : 1;
m_numCols = uSet.size() > 1 ? uSet.size() - 1 : 1;
m_numRows = static_cast<uint>(vSet.size() > 1 ? vSet.size() - 1 : 1);
m_numCols = static_cast<uint>(uSet.size() > 1 ? uSet.size() - 1 : 1);
// Text input fields displaying row/col information for auto-extracting
// spritesheet cells