Merge remote-tracking branch 'zini/master' into animation2

CMakeLists.txt

@@ -306,7 +306,7 @@ endif()
 
 # Compiler settings
 if (CMAKE_COMPILER_IS_GNUCC)
-    add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++03 -pedantic -Wno-long-long)
+    add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++98 -pedantic -Wno-long-long)
 
     # Silence warnings in OGRE headers. Remove once OGRE got fixed!
     add_definitions (-Wno-ignored-qualifiers)

apps/openmw/mwrender/terrain.cpp

@@ -3,6 +3,7 @@
 #include <OgreTerrain.h>
 #include <OgreTerrainGroup.h>
 #include <OgreHardwarePixelBuffer.h>
+#include <OgreRoot.h>
 
 #include "../mwworld/esmstore.hpp"
 
@@ -178,6 +179,16 @@ namespace MWRender
             }
         }
 
+        // when loading from a heightmap, Ogre::Terrain does not update the derived data (normal map, LOD)
+        // synchronously, even if we supply synchronous = true parameter to loadTerrain.
+        // the following to be the only way to make sure derived data is ready when rendering the next frame.
+        while (mTerrainGroup.isDerivedDataUpdateInProgress())
+        {
+           // we need to wait for this to finish
+           OGRE_THREAD_SLEEP(5);
+           Root::getSingleton().getWorkQueue()->processResponses();
+        }
+
         mTerrainGroup.freeTemporaryResources();
     }
 

readme.txt

@@ -114,8 +114,10 @@ Bug #521: MWGui::InventoryWindow creates a duplicate player actor at the origin
 Bug #524: Beast races are able to wear shoes
 Bug #527: Background music fails to play
 Bug #533: The arch at Gnisis entrance is not displayed
+Bug #534: Terrain gets its correct shape only some time after the cell is loaded
 Bug #536: The same entry can be added multiple times to the journal
 Bug #539: Race selection is broken
+Bug #544: Terrain normal map corrupt when the map is rendered
 Feature #39: Video Playback
 Feature #151: ^-escape sequences in text output
 Feature #392: Add AI related script functions