repair bug: changedisplay(armature,i>=0) does not reblind parentbone
Merge pull request #1 from 2youyouo2/develop

merge kaile
Merge pull request #3 from geron-cn/develop

repair bug: changedisplay(armature,i>=0) does not reblind parentbone
fixed set blend func
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
remove cc prefix
Merge pull request #6125 from 2youyouo2/develop

Two fixes for armature:
1.fixed set blend func
2.fixed changedisplay does not rebind parent's bone