Merge kbm-ig into kbm

This commit is contained in:
qloak committed 2026-09-14 16:26:34 -07:00
commit 3521b06611
1371 files changed
+260387 -267883

No files matched your search

+2 -2
View File
@@ -67,7 +67,7 @@ void UILayer::tick()
void UILayer::render(S32 width, S32 height, C4JRender::eViewportType viewport)
{
if(!ui.IsExpectingOrReloadingSkin())
if(!ui.IsExpectingOrReloadingSkins())
{
for(AUTO_VAR(it,m_components.begin()); it != m_components.end(); ++it)
{
@@ -93,7 +93,7 @@ void UILayer::render(S32 width, S32 height, C4JRender::eViewportType viewport)
if(lowestRenderable < 0) lowestRenderable = 0;
for(;lowestRenderable < m_sceneStack.size(); ++lowestRenderable)
{
if(m_sceneStack[lowestRenderable]->isVisible() && (!ui.IsExpectingOrReloadingSkin() || m_sceneStack[lowestRenderable]->getSceneType()==eUIScene_Timer))
if(m_sceneStack[lowestRenderable]->isVisible() && (!ui.IsExpectingOrReloadingSkins() || m_sceneStack[lowestRenderable]->getSceneType()==eUIScene_Timer))
{
PIXBeginNamedEvent(0, "Rendering scene %d", m_sceneStack[lowestRenderable]->getSceneType() );
m_sceneStack[lowestRenderable]->render(width, height,viewport);