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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/Objects/DisplayContextShared.inl
+2 -3
View File
@@ -539,7 +539,6 @@ void DisplayContext::DrawHalfDottedCircle(const Vec3& pos, float radius, const V
void DisplayContext::DrawDottedCircle(const Vec3& pos, float radius, const Vec3& nUnchangedAxis, int numberOfArrows /*=0*/, float stepDegree /*= 1*/)
{
float startAngleRadians = 0;
float sweepAngleRadians = 2 * gf_PI;
Vec3 a;
Vec3 b;
@@ -892,8 +891,8 @@ void DisplayContext::DrawDottedLine(const Vec3& p1, const Vec3& p2, [[maybe_unus
//////////////////////////////////////////////////////////////////////////
void DisplayContext::PushMatrix(const Matrix34& tm)
{
assert(m_currentMatrix < 32);
if (m_currentMatrix < 32)
assert(m_currentMatrix < 31);
if (m_currentMatrix < 31)
{
m_currentMatrix++;
m_matrixStack[m_currentMatrix] = m_matrixStack[m_currentMatrix - 1] * tm;