Changeset 8274 for code/branches/kicklib/src

Timestamp:

Apr 20, 2011, 4:16:31 AM (14 years ago)

Author:

rgrieder

Message:

Do not merge resources.oxr files to avoid problems at intall time.

File:

• code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) (2 diffs)

code/branches/kicklib/src/libraries/core/GraphicsManager.cc

@@ -107 +107 @@
         // Only for development runs
         if (PathConfig::isDevelopmentRun())
-        {
             Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getExternalDataPathString(), "FileSystem");
-            extResources_.reset(new XMLFile("resources.oxr"));
-            extResources_->setLuaSupport(false);
-            Loader::open(extResources_.get());
-        }
+
+        extResources_.reset(new XMLFile("resources.oxr"));
+        extResources_->setLuaSupport(false);
+        Loader::open(extResources_.get());
 
         if (bLoadRenderer)
@@ -134 +133 @@
         // Undeclare the resources
         Loader::unload(resources_.get());
-        if (PathConfig::isDevelopmentRun())
-            Loader::unload(extResources_.get());
+        Loader::unload(extResources_.get());
     }