Integrating github/staging through commit ab87ed9

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
@@ -98,8 +98,6 @@ void CDrawContext::StopDrawing()
// Restore old flags that where set before our draw context.
m_pAuxRender->SetRenderFlags(m_prevRenderFlags);
int width = gEnv->pRenderer->GetWidth();
int height = gEnv->pRenderer->GetHeight();
gEnv->pRenderer->Unset2DMode(m_backupSceneMatrices);
}
@@ -159,4 +157,4 @@ void CDrawContext::PopClientRect()
m_currentStackLevel--;
}
}
MINIGUI_END
MINIGUI_END