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

Merge pull request #1858 from dumganhar/iss1662-particle-fullpath 

fixed #1662: Getting full path will fail if texture name in the plist is without relative path.
This commit is contained in:
James Chen 2013-01-16 19:48:52 -08:00
parent cc2865e294 f70e4db254
commit 822dde27ef
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos2dx/particle_nodes/CCParticleSystem.cpp
View File

@ -323,6 +323,13 @@ bool CCParticleSystem::initWithDictionary(CCDictionary *dictionary, const char *
textureName = string(dirname) + textureName;
}
}
else
{
if (dirname != NULL)
{
textureName = string(dirname) + textureName;
}
}
CCTexture2D *tex = NULL;