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

Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist

This commit is contained in:
James Chen 2014-01-08 10:36:51 +08:00
parent 6529380b77 b7314cd655
commit 685b80796b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/2d/CCParticleSystem.cpp
View File

@ -357,12 +357,9 @@ bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string&
textureName = dirname + textureName;
}
}
else
else if ( dirname.size()>0 && textureName.empty() == false)
{
if (dirname.size()>0)
{
textureName = dirname + textureName;
}
textureName = dirname + textureName;
}
Texture2D *tex = nullptr;

2
cocos/2d/CCTextureCache.h
View File

@ -106,7 +106,7 @@ public:
* If the filename was not previously loaded, it will create a new Texture2D
* object and it will return it. It will use the filename as a key.
* Otherwise it will return a reference of a previously loaded image.
* Supported image extensions: .png, .bmp, .tiff, .jpeg, .pvr, .gif
* Supported image extensions: .png, .bmp, .tiff, .jpeg, .pvr
*/
Texture2D* addImage(const std::string &filepath);