[Orxonox-commit 6444] r11101 - in code/trunk: cmake/tools src/libraries/core

[landauf at orxonox.net]

Author: landauf
Date: 2016-01-31 10:57:21 +0100 (Sun, 31 Jan 2016)
New Revision: 11101

Modified:
   code/trunk/cmake/tools/FindCEGUI.cmake
   code/trunk/src/libraries/core/GUIManager.cc
Log:
fixed build when combining new cegui with old ogre

Modified: code/trunk/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/trunk/cmake/tools/FindCEGUI.cmake	2016-01-28 14:56:24 UTC (rev 11100)
+++ code/trunk/cmake/tools/FindCEGUI.cmake	2016-01-31 09:57:21 UTC (rev 11101)
@@ -47,7 +47,7 @@
     PATH_SUFFIXES include
   )
 ELSE()
-  # 0.8 and older
+  # 0.7 and older
   FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
     PATHS $ENV{CEGUIDIR}
     PATH_SUFFIXES include include/CEGUI

Modified: code/trunk/src/libraries/core/GUIManager.cc
===================================================================
--- code/trunk/src/libraries/core/GUIManager.cc	2016-01-28 14:56:24 UTC (rev 11100)
+++ code/trunk/src/libraries/core/GUIManager.cc	2016-01-31 09:57:21 UTC (rev 11101)
@@ -250,6 +250,9 @@
                 Ogre::Root::getSingleton().getRenderSystem()->setScissorTest(false);
             }
         }
+#if OGRE_VERSION < 0x010700
+        virtual void renderQueueEnded(Ogre::uint8 id, const Ogre::String& invocation, bool& repeatThisInvocation) override {}
+#endif
     };
 #endif