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

Fixed merge conflict.

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-08-25 16:13:22 -05:00
parent d211771253 45b2336dce
commit 4b672a0a32
148 changed files with 1583 additions and 16213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
+5 -3
View File
@@ -16,6 +16,7 @@
#include <AzCore/Component/ComponentApplicationBus.h>
#include <StlUtils.h>
#include <StaticInstance.h>
#include <ISystem.h>
#include <ILog.h>
#include <IConsole.h>
@@ -746,8 +747,9 @@ void UiAnimationSystem::ShowPlayedSequencesDebug()
continue;
}
const char* fullname = playingSequence.sequence->GetName();
gEnv->pRenderer->Draw2dLabel(1.0f, y, 1.3f, green, false, "Sequence %s : %f (x %f)", fullname, playingSequence.currentTime, playingSequence.currentSpeed);
AZ_Assert(false,"gEnv->pRenderer is always null so it can't be used here");
//const char* fullname = playingSequence.sequence->GetName();
//gEnv->pRenderer->Draw2dLabel(1.0f, y, 1.3f, green, false, "Sequence %s : %f (x %f)", fullname, playingSequence.currentTime, playingSequence.currentSpeed);
y += 16.0f;
@@ -766,7 +768,7 @@ void UiAnimationSystem::ShowPlayedSequencesDebug()
names.push_back(name);
}
gEnv->pRenderer->Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name.c_str());
//gEnv->pRenderer->Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name.c_str());
}
y += 32.0f;