From e7ab3544acc3fb5047998c7cdb13e15b56b2fce1 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 21 Jul 2012 13:52:12 +0200 Subject: [PATCH] removed some redundant code --- apps/launcher/graphicspage.cpp | 4 ---- libs/openengine/ogre/renderer.cpp | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 8caa2b550..3c1d76f3d 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -79,11 +79,7 @@ bool GraphicsPage::setupOgre() try { -#if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9) mOgre = new Ogre::Root("", "", "./launcherOgre.log"); -#else - mOgre = new Ogre::Root("", "", "./launcherOgre.log"); -#endif } catch(Ogre::Exception &ex) { diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp index 7e609faa8..e40bdf708 100644 --- a/libs/openengine/ogre/renderer.cpp +++ b/libs/openengine/ogre/renderer.cpp @@ -88,11 +88,10 @@ void OgreRenderer::configure(const std::string &logPath, // Disable logging log->setDebugOutputEnabled(false); - #if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9) || defined(ENABLE_PLUGIN_CgProgramManager) || defined(ENABLE_PLUGIN_OctreeSceneManager) || defined(ENABLE_PLUGIN_ParticleFX) mRoot = new Root("", "", ""); + + #if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9) || defined(ENABLE_PLUGIN_CgProgramManager) || defined(ENABLE_PLUGIN_OctreeSceneManager) || defined(ENABLE_PLUGIN_ParticleFX) loadPlugins(); - #else - mRoot = new Root("", "", ""); #endif std::string pluginDir;