Revision: 1559
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1559&view=rev
Author: rorthomas
Date: 2010-12-19 16:38:37 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
fixed cachesystem bug with resources already loaded by ogre
Modified Paths:
--------------
trunk/source/main/CacheSystem.cpp
Modified: trunk/source/main/CacheSystem.cpp
===================================================================
--- trunk/source/main/CacheSystem.cpp 2010-12-19 10:39:47 UTC (rev 1558)
+++ trunk/source/main/CacheSystem.cpp 2010-12-19 16:38:37 UTC (rev 1559)
@@ -2620,6 +2620,14 @@
bool CacheSystem::checkResourceLoaded(Ogre::String &filename, Ogre::String
&group)
{
+ // check if we already loaded it via ogre ...
+ bool exists =
ResourceGroupManager::getSingleton().resourceExistsInAnyGroup(filename);
+ if(exists)
+ {
+ group =
ResourceGroupManager::getSingleton().findGroupContainingResource(filename);
+ return true;
+ }
+
std::vector<Cache_Entry>::iterator it;
//int counter=0;
for(it = entries.begin(); it != entries.end(); it++)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
