Merge branch 'next' into weather

Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
This commit is contained in:
scrawl
2012-02-19 23:27:26 +01:00
3 changed files with 3 additions and 4 deletions
-3
View File
@@ -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 ()