Changeset 7709 for code/trunk/src

Timestamp:

Dec 3, 2010, 2:37:11 PM (13 years ago)

Author:

dafrick

Message:

Merging data_cleanup branch. You will need to update your data repository as well as your local copy of the code.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/tools/ResourceLocation.cc (modified) (1 diff)

code/trunk/src/libraries/core/GUIManager.cc

@@ -125 +125 @@
         guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
-        resourceProvider_->setDefaultResourceGroup("GUI");
+        resourceProvider_->setDefaultResourceGroup("General");
 
         // Setup scripting

code/trunk/src/libraries/tools/ResourceLocation.cc

@@ -49 +49 @@
         // Default values
         archiveType_ = "FileSystem";
-        bRecursive_  = true;
+        bRecursive_  = false;
     }