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

Merge pull request #7332 from 2youyouo2/v3 

fixed set color to parent, it will effect its children
This commit is contained in:
minggo 2014-07-08 10:26:58 +08:00
parent bf1ec7d463 f01b249880
commit b583684d61
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp
View File

@ -303,12 +303,10 @@ void NodeReader::initNode(Node* node, const rapidjson::Value& json)
if(alpha != 255) if(alpha != 255)
{ {
node->setOpacity(alpha); node->setOpacity(alpha);
node->setCascadeOpacityEnabled(true);
} }
if(red != 255 || green != 255 || blue != 255) if(red != 255 || green != 255 || blue != 255)
{ {
node->setColor(Color3B(red, green, blue)); node->setColor(Color3B(red, green, blue));
node->setCascadeColorEnabled(true);
} }