mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-07 05:15:34 +00:00
Merge branch 'window_update' into 'master'
Do not update WindowManager by world data when there is no game See merge request OpenMW/openmw!3588
This commit is contained in:
commit
fe02978c13
1 changed files with 6 additions and 1 deletions
|
@ -318,9 +318,14 @@ bool OMW::Engine::frame(float frametime)
|
||||||
mViewer->eventTraversal();
|
mViewer->eventTraversal();
|
||||||
mViewer->updateTraversal();
|
mViewer->updateTraversal();
|
||||||
|
|
||||||
|
// update GUI by world data
|
||||||
{
|
{
|
||||||
ScopedProfile<UserStatsType::WindowManager> profile(frameStart, frameNumber, *timer, *stats);
|
ScopedProfile<UserStatsType::WindowManager> profile(frameStart, frameNumber, *timer, *stats);
|
||||||
mWorld->updateWindowManager();
|
|
||||||
|
if (mStateManager->getState() != MWBase::StateManager::State_NoGame)
|
||||||
|
{
|
||||||
|
mWorld->updateWindowManager();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mLuaWorker->allowUpdate(); // if there is a separate Lua thread, it starts the update now
|
mLuaWorker->allowUpdate(); // if there is a separate Lua thread, it starts the update now
|
||||||
|
|
Loading…
Reference in a new issue