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

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature

This commit is contained in:
samuele3hu 2013-10-10 11:48:20 +08:00
parent 531e454eae 4bcfd681b5
commit 3104bfbe50
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -4,6 +4,7 @@ cocos2d-x-3.0alpha1 @??? 2013
[FIX] Texture: use CCLOG to log when a texture is being decoded in software [FIX] Texture: use CCLOG to log when a texture is being decoded in software
[FIX] Spine: fix memory leaks [FIX] Spine: fix memory leaks
[FIX] fixed a memory leak in XMLHTTPRequest.cpp [FIX] fixed a memory leak in XMLHTTPRequest.cpp
[FIX] removeSpriteFramesFromFile() crashes if file doesn't exist.
[Android] [Android]
[FIX] Added EGL_RENDERABLE_TYPE to OpenGL attributes [FIX] Added EGL_RENDERABLE_TYPE to OpenGL attributes
[NEW] Added Cocos2dxHelper.runOnGLThread(Runnable) again [NEW] Added Cocos2dxHelper.runOnGLThread(Runnable) again

6
cocos2dx/sprite_nodes/CCSpriteFrameCache.cpp
View File

@ -344,7 +344,11 @@ void SpriteFrameCache::removeSpriteFramesFromFile(const char* plist)
{ {
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(plist); std::string fullPath = FileUtils::getInstance()->fullPathForFilename(plist);
Dictionary* dict = Dictionary::createWithContentsOfFileThreadSafe(fullPath.c_str()); Dictionary* dict = Dictionary::createWithContentsOfFileThreadSafe(fullPath.c_str());
if (dict == nullptr)
{
CCLOG("cocos2d:SpriteFrameCache:removeSpriteFramesFromFile: create dict by %s fail.",plist);
return;
}
removeSpriteFramesFromDictionary((Dictionary*)dict); removeSpriteFramesFromDictionary((Dictionary*)dict);
// remove it from the cache // remove it from the cache

2
samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
d846dfb9965fecfad1f6fe6190516035158c4d53 381c282bed409f4b41a82505460d4d6c84ba70ab