Merge pull request #7825 from 2youyouo2/v3

remove cascade color for CorlorFrame
2014-08-20 10:23:15 +08:00 · 2014-08-20 10:23:15 +08:00 · 74fba21fc0
parent 41905cb4c0 d884054ec9
commit 74fba21fc0
1 changed files with 0 additions and 3 deletions
--- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
+++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
@ -516,9 +516,6 @@ void ColorFrame::onEnter(Frame *nextFrame)
        _betweenGreen = color.g - _color.g;
        _betweenBlue  = color.b - _color.b;
    }
-
-    _node->setCascadeColorEnabled(true);
-    _node->setCascadeOpacityEnabled(true);
 }

 void ColorFrame::apply(float percent)