mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 04:20:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'next' into weather

Browse Source 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
This commit is contained in:
scrawl 2012-02-19 23:27:26 +01:00
commit 705d85e7d1
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/engine.cpp
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)
{

2
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -128,6 +128,8 @@ void RenderingManager::update (float duration){
mActors.update (duration);
mSkyManager->update(duration);
mRendering.update(duration);
}
void RenderingManager::skyEnable ()

2
libs/openengine

@ -1 +1 @@
Subproject commit b77f5c06cc3fd818a5efbbb42d6c2a079fa91143
Subproject commit eb61ba59e64c332931c12251cac40de5836ff9cd