Merge branch 'next' into weather
Conflicts: apps/openmw/mwrender/renderingmanager.cpp
This commit is contained in:
@@ -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
Submodule libs/openengine updated: b77f5c06cc...eb61ba59e6
Reference in New Issue
Block a user