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

Merge pull request #16137 from yalab/cocosstudio_with_texturepacker 

Fixed to use cocosstudio LoadingBarReader with TexturePacker.
This commit is contained in:
minggo 2016-07-18 14:14:49 +08:00 committed by GitHub
parent 15ef80e27d ef21e44d9c
commit 04ebd952a0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
View File

@ -262,6 +262,11 @@ namespace cocostudio
{
fileExist = true;
}
else if (SpriteFrameCache::getInstance()->getSpriteFrameByName(imageFileName))
{
fileExist = true;
imageFileNameType = 1;
}
else
{
errorFilePath = imageFileName;