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/Maestro/Code/Source/Cinematics/SceneNode.cpp
+2 -2
View File
@@ -254,7 +254,7 @@ void CAnimSceneNode::CreateDefaultTracks()
//////////////////////////////////////////////////////////////////////////
unsigned int CAnimSceneNode::GetParamCount() const
{
return s_nodeParams.size();
return static_cast<unsigned int>(s_nodeParams.size());
}
//////////////////////////////////////////////////////////////////////////
@@ -661,7 +661,7 @@ void CAnimSceneNode::OnStop()
//////////////////////////////////////////////////////////////////////////
void CAnimSceneNode::ResetSounds()
{
for (int i = m_SoundInfo.size(); --i >= 0; )
for (int i = static_cast<int>(m_SoundInfo.size()); --i >= 0; )
{
m_SoundInfo[i].Reset();
}