mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-28 20:06:41 +00:00
Code Issues Releases Wiki Activity

Commit before merge

Browse source
This commit is contained in:
Mads Buvik Sandvei 2020-06-28 11:41:04 +02:00
parent 45656f1d06
commit 519163c121
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/engine.cpp
View file

@ -486,7 +486,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
createWindow(settings); createWindow(settings);
osg::ref_ptr<osg::Group> rootNode (new osg::Group); osg::ref_ptr<osg::Group> rootNode (new osg::Group);
mViewer->setSceneData(rootNode); mViewer->setSceneData(rootNode);
mVFS.reset(new VFS::Manager(mFSStrict)); mVFS.reset(new VFS::Manager(mFSStrict));
@ -503,7 +502,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
); );
int numThreads = Settings::Manager::getInt("preload num threads", "Cells"); int numThreads = Settings::Manager::getInt("preload num threads", "Cells");
Log(Debug::Verbose) << "Num threads: " << numThreads;
if (numThreads <= 0) if (numThreads <= 0)
throw std::runtime_error("Invalid setting: 'preload num threads' must be >0"); throw std::runtime_error("Invalid setting: 'preload num threads' must be >0");
mWorkQueue = new SceneUtil::WorkQueue(numThreads); mWorkQueue = new SceneUtil::WorkQueue(numThreads);
@ -780,10 +778,10 @@ void OMW::Engine::go()
{ {
mViewer->eventTraversal(); mViewer->eventTraversal();
mViewer->updateTraversal();
mEnvironment.getWorld()->updateWindowManager(); mEnvironment.getWorld()->updateWindowManager();
mViewer->updateTraversal();
mViewer->renderingTraversals(); mViewer->renderingTraversals();
bool guiActive = mEnvironment.getWindowManager()->isGuiMode(); bool guiActive = mEnvironment.getWindowManager()->isGuiMode();