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

Merge pull request #7356 from 2youyouo2/v3 

fixed Armature blend func effect
This commit is contained in:
minggo 2014-07-09 18:37:15 +08:00
parent bfc9f6ba78 c53cb42e83
commit 7d74be3158
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/editor-support/cocostudio/CCArmature.cpp
View File

@ -402,9 +402,9 @@ void Armature::draw(cocos2d::Renderer *renderer, const Mat4 &transform, uint32_t
Skin *skin = static_cast<Skin *>(node); Skin *skin = static_cast<Skin *>(node);
skin->updateTransform(); skin->updateTransform();
bool blendDirty = bone->isBlendDirty(); BlendFunc func = bone->getBlendFunc();
if (blendDirty) if (func.src != _blendFunc.src || func.dst != _blendFunc.dst)
{ {
skin->setBlendFunc(bone->getBlendFunc()); skin->setBlendFunc(bone->getBlendFunc());
} }