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

Merge pull request #10904 from pipu/fixed_widget_reader_actiontag 

Optimize parse action tag for node and widget.
This commit is contained in:
minggo 2015-03-17 14:18:22 +08:00
parent f51e2b9537 a5e9ebc4e6
commit aa573a9553
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp
View File

@ -512,7 +512,6 @@ namespace cocostudio
node->setColor(color); node->setColor(color);
node->setTag(tag); node->setTag(tag);
node->setUserObject(timeline::ActionTimelineData::create(actionTag));
ObjectExtensionData* extensionData = ObjectExtensionData::create(); ObjectExtensionData* extensionData = ObjectExtensionData::create();
extensionData->setCustomProperty(customProperty); extensionData->setCustomProperty(customProperty);

2
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
View File

@ -799,8 +799,6 @@ namespace cocostudio
extensionData->setActionTag(actionTag); extensionData->setActionTag(actionTag);
node->setUserObject(extensionData); node->setUserObject(extensionData);
widget->setUserObject(timeline::ActionTimelineData::create(actionTag));
bool touchEnabled = options->touchEnabled() != 0; bool touchEnabled = options->touchEnabled() != 0;
widget->setTouchEnabled(touchEnabled); widget->setTouchEnabled(touchEnabled);