From 4cc0dd129ad9c898693903039252a9739cf7af3f Mon Sep 17 00:00:00 2001 From: jianglong0156 Date: Mon, 12 Jan 2015 11:57:03 +0800 Subject: [PATCH] issue cocos2d/cocos2d-js #2563 : ActionTimelineData need to use its constructor in jsb code. So i modify the constructor to public --- .../cocostudio/ActionTimeline/CCActionTimeline.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h index 567188dec2..acf03b2582 100644 --- 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; };