Merge branch 'v3' into parse_inneractionframe

2015-01-12 14:26:05 +08:00 · 2015-01-12 14:26:05 +08:00 · d364a329db
parent 7e83336af8 4f4d49ef79
commit d364a329db
1 changed files with 2 additions and 2 deletions
--- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h
+++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h
@ -45,10 +45,10 @@ public:

    virtual void setActionTag(int actionTag) { _actionTag = actionTag; }
    virtual int getActionTag() const { return _actionTag; }
-protected:
+CC_CONSTRUCTOR_ACCESS:
    ActionTimelineData();
    virtual bool init(int actionTag);
-
+protected:
    int _actionTag;
 };