forked from teamnwah/openmw-tes3coop
Merge branch 'next' into weather
Conflicts: apps/openmw/mwrender/renderingmanager.cpp
This commit is contained in:
commit
705d85e7d1
3 changed files with 3 additions and 4 deletions
|
@ -162,9 +162,6 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
|
|||
// report focus object (for debugging)
|
||||
if (mReportFocus)
|
||||
updateFocusReport (mEnvironment.mFrameDuration);
|
||||
|
||||
// update ogre renderer
|
||||
mOgre->update(evt.timeSinceLastFrame);
|
||||
}
|
||||
catch (const std::exception& e)
|
||||
{
|
||||
|
|
|
@ -128,6 +128,8 @@ void RenderingManager::update (float duration){
|
|||
mActors.update (duration);
|
||||
|
||||
mSkyManager->update(duration);
|
||||
|
||||
mRendering.update(duration);
|
||||
}
|
||||
|
||||
void RenderingManager::skyEnable ()
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit b77f5c06cc3fd818a5efbbb42d6c2a079fa91143
|
||||
Subproject commit eb61ba59e64c332931c12251cac40de5836ff9cd
|
Loading…
Reference in a new issue