Move loading of SP shaders after downloading assets
This commit is contained in:
parent
d24e253435
commit
3293196707
@ -994,6 +994,8 @@ void IrrDriver::applyResolutionSettings()
|
|||||||
{
|
{
|
||||||
m_perf_query[i]->reset();
|
m_perf_query[i]->reset();
|
||||||
}
|
}
|
||||||
|
if (CVS->isGLSL())
|
||||||
|
SP::loadShaders();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
font_manager = new FontManager();
|
font_manager = new FontManager();
|
||||||
|
@ -580,8 +580,6 @@ void init()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
loadShaders();
|
|
||||||
|
|
||||||
} // init
|
} // init
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@ -136,6 +136,8 @@ void resetEmptyFogColor();
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
void drawBoundingBoxes();
|
void drawBoundingBoxes();
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
void loadShaders();
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
SPMesh* convertEVTStandard(irr::scene::IMesh* mesh,
|
SPMesh* convertEVTStandard(irr::scene::IMesh* mesh,
|
||||||
const irr::video::SColor* color = NULL);
|
const irr::video::SColor* color = NULL);
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@ -1745,7 +1745,13 @@ void initRest()
|
|||||||
#ifndef SERVER_ONLY
|
#ifndef SERVER_ONLY
|
||||||
addons_manager = NULL;
|
addons_manager = NULL;
|
||||||
if (!ProfileWorld::isNoGraphics())
|
if (!ProfileWorld::isNoGraphics())
|
||||||
|
{
|
||||||
|
// Need to load shader after downloading assets as it reads prefilled
|
||||||
|
// textures
|
||||||
|
if (CVS->isGLSL())
|
||||||
|
SP::loadShaders();
|
||||||
addons_manager = new AddonsManager();
|
addons_manager = new AddonsManager();
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
Online::ProfileManager::create();
|
Online::ProfileManager::create();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user