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

Merge pull request #16008 from yalab/cocosstudio_with_texturepacker 

cocosstudio can manage TexturePacker Image.
This commit is contained in:
minggo 2016-07-01 10:10:09 +08:00 committed by GitHub
parent 2610ad77cc c5648db10a
commit 043d81be1c
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/ImageViewReader/ImageViewReader.cpp
View File

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