From a5e9ebc4e650acb4434ba12f3140aa650df8ab8a Mon Sep 17 00:00:00 2001 From: pipu Date: Mon, 16 Mar 2015 20:04:59 +0800 Subject: [PATCH] Fix parse action tag for widget. --- .../cocostudio/WidgetReader/NodeReader/NodeReader.cpp | 1 - cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp index 499b418a63..a0ad52d60d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/NodeReader/NodeReader.cpp @@ -512,7 +512,6 @@ namespace cocostudio node->setColor(color); node->setTag(tag); - node->setUserObject(timeline::ActionTimelineData::create(actionTag)); ObjectExtensionData* extensionData = ObjectExtensionData::create(); extensionData->setCustomProperty(customProperty); diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp index 6b714395f4..88ddec98c2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp @@ -799,8 +799,6 @@ namespace cocostudio extensionData->setActionTag(actionTag); node->setUserObject(extensionData); - widget->setUserObject(timeline::ActionTimelineData::create(actionTag)); - bool touchEnabled = options->touchEnabled() != 0; widget->setTouchEnabled(touchEnabled);