Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3

This commit is contained in:
yangxiao 2015-03-09 17:46:43 +08:00
parent 2c468cbdc6 b0b8ae1112
commit 0eee4e2ab6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/Particle3D/PU/CCPUMaterialManager.cpp
View File

@ -177,7 +177,7 @@ bool PUMaterialCache::loadMaterialsFromSearchPaths( const std::string &fileFolde
} }
std::string fullpath = fileFolder + "/" + file->d_name; std::string fullpath = fileFolder + "/" + file->d_name;
if (strlen(file->d_name) > 9 && strcmp(".material", file->d_name + strlen(file->d_name) - 9)) if (strlen(file->d_name) > 9 && (strcmp(".material", file->d_name + strlen(file->d_name) - 9) == 0))
{ {
CCLOG("%s", fullpath.c_str()); CCLOG("%s", fullpath.c_str());
loadMaterials(fullpath); loadMaterials(fullpath);