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

Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3

This commit is contained in:
songchengjiang 2015-11-27 09:34:31 +08:00
parent dcfdfd3a78 aa38dfba89
commit fc4c3ec650
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/renderer/CCFrameBuffer.cpp
View File

@ -397,7 +397,6 @@ FrameBuffer::FrameBuffer()
FrameBuffer::~FrameBuffer() FrameBuffer::~FrameBuffer()
{ {
if(!isDefaultFBO())
{ {
CC_SAFE_RELEASE_NULL(_rt); CC_SAFE_RELEASE_NULL(_rt);
CC_SAFE_RELEASE_NULL(_rtDepthStencil); CC_SAFE_RELEASE_NULL(_rtDepthStencil);
@ -407,6 +406,8 @@ FrameBuffer::~FrameBuffer()
#if CC_ENABLE_CACHE_TEXTURE_DATA #if CC_ENABLE_CACHE_TEXTURE_DATA
Director::getInstance()->getEventDispatcher()->removeEventListener(_dirtyFBOListener); Director::getInstance()->getEventDispatcher()->removeEventListener(_dirtyFBOListener);
#endif #endif
if (isDefaultFBO())
_defaultFBO = nullptr;
} }
} }

4
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
View File

@ -319,10 +319,10 @@ void terraindata_to_luaval(lua_State* L,const cocos2d::Terrain::TerrainData& inV
lua_rawset(L, -3); lua_rawset(L, -3);
} }
if (nullptr != inValue._alphaMapSrc) if (!inValue._alphaMapSrc.empty())
{ {
lua_pushstring(L, "_alphaMapSrc"); lua_pushstring(L, "_alphaMapSrc");
lua_pushstring(L, inValue._alphaMapSrc); lua_pushstring(L, inValue._alphaMapSrc.c_str());
lua_rawset(L, -3); lua_rawset(L, -3);
} }