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

Merge branch 'v3' into parse_inneractionframe

This commit is contained in:
pipu 2015-01-12 14:26:05 +08:00
parent 7e83336af8 4f4d49ef79
commit d364a329db
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h
View File

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