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

Fixes for Android/Linux

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-16 19:52:00 -07:00
parent 9a8ec8bfcd
commit e3cf15a00f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Controls/ConsoleSCB.cpp
+2 -2
View File
@@ -837,11 +837,11 @@ static void SetEditorRange(EditorType* editor, IVariable* var)
static const float defaultMax = 100.0f;
if (var->HasCustomLimits())
{
editor->setRange(static_cast<EditorType::value_type>(min), static_cast<EditorType::value_type>(max));
editor->setRange(static_cast<typename EditorType::value_type>(min), static_cast<typename EditorType::value_type>(max));
}
else
{
editor->setSoftRange(static_cast<EditorType::value_type>(defaultMin), static_cast<EditorType::value_type>(defaultMax));
editor->setSoftRange(static_cast<typename EditorType::value_type>(defaultMin), static_cast<typename EditorType::value_type>(defaultMax));
}
// Set the step size. The default variable step is 0, so if it's
Gems/LyShine/Code/Source/Animation/AnimTrack.h
+5 -3
View File
@@ -221,6 +221,8 @@ protected:
float m_lastTime;
int m_flags;
constexpr unsigned int InvalidKey = 0x7FFFFFFF;
UiAnimParamData m_componentParamData;
#ifdef UI_ANIMATION_SYSTEM_SUPPORT_EDITING
@@ -521,7 +523,7 @@ inline int TUiAnimTrack<KeyType>::GetActiveKey(float time, KeyType* key)
if (nkeys == 0)
{
m_lastTime = time;
m_currKey = std::numeric_limits<unsigned int>::max();
m_currKey = InvalidKey;
return m_currKey;
}
@@ -554,7 +556,7 @@ inline int TUiAnimTrack<KeyType>::GetActiveKey(float time, KeyType* key)
}
else
{
m_currKey = std::numeric_limits<unsigned int>::max();
m_currKey = InvalidKey;
}
return m_currKey;
}
@@ -600,6 +602,6 @@ inline int TUiAnimTrack<KeyType>::GetActiveKey(float time, KeyType* key)
break;
}
}
m_currKey = std::numeric_limits<unsigned int>::max();
m_currKey = InvalidKey;
return m_currKey;
}