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

Fix clang 13 compilation problems (#5791)

Browse Source 
* Fix clang 13 compilation problems

Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* apply review suggestions

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix type in assert message

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-11-25 10:24:39 +01:00
committed by GitHub
parent 0883921eb3
commit eca2e36687
48 changed files with 180 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
+1 -11
View File
@@ -2233,7 +2233,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
if (pTrack && inRange)
{
bool keyCreated = false;
if (bTryAddKeysInGroup && pNode->GetParentNode()) // Add keys in group
{
CTrackViewTrackBundle tracksInGroup = pNode->GetTracksByParam(pTrack->GetParameterType());
@@ -2248,8 +2247,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
pCurrTrack->CreateKey(keyTime);
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
keyCreated = true;
}
}
else // A compound track
@@ -2262,8 +2259,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
pSubTrack->CreateKey(keyTime);
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
keyCreated = true;
}
}
}
@@ -2276,15 +2271,13 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
pTrack->CreateKey(keyTime);
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
keyCreated = true;
}
}
else // A compound track
{
if (pTrack->GetValueType() == AnimValueType::RGB)
{
keyCreated = CreateColorKey(pTrack, keyTime);
CreateColorKey(pTrack, keyTime);
}
else
{
@@ -2295,7 +2288,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
if (IsOkToAddKeyHere(pSubTrack, keyTime))
{
pSubTrack->CreateKey(keyTime);
keyCreated = true;
}
}
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
@@ -2617,7 +2609,6 @@ void CTrackViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter*
void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
{
int x0 = TimeToClient(timeRange.start);
float t0 = timeRange.start;
const QBrush prevBrush = painter->brush();
painter->setBrush(m_visibilityBrush);
@@ -2648,7 +2639,6 @@ void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* pa
painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient);
}
t0 = time;
x0 = x;
}
int x = TimeToClient(timeRange.end);