From f6eac43a0a7f8b0e9d1fbab62fecc45bf0c2968a Mon Sep 17 00:00:00 2001 From: 2youyou2 Date: Mon, 5 May 2014 09:45:06 +0800 Subject: [PATCH 1/3] fixed no effect with stopping tween between two frames --- cocos/editor-support/cocostudio/CCDatas.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cocos/editor-support/cocostudio/CCDatas.cpp b/cocos/editor-support/cocostudio/CCDatas.cpp index 5e97f43519..44030e2ea1 100644 --- a/cocos/editor-support/cocostudio/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/CCDatas.cpp @@ -290,7 +290,8 @@ void FrameData::copy(const BaseData *baseData) } } - blendFunc = frameData->blendFunc; + blendFunc = frameData->blendFunc; + isTween = frameData->isTween; } } From d4f644814c194a6f4abd6101e64a4193040ce8c5 Mon Sep 17 00:00:00 2001 From: 2youyou2 Date: Mon, 5 May 2014 17:43:15 +0800 Subject: [PATCH 2/3] change tab to 4 space --- cocos/editor-support/cocostudio/CCDatas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/editor-support/cocostudio/CCDatas.cpp b/cocos/editor-support/cocostudio/CCDatas.cpp index 44030e2ea1..14e0f942dd 100644 --- a/cocos/editor-support/cocostudio/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/CCDatas.cpp @@ -291,7 +291,7 @@ void FrameData::copy(const BaseData *baseData) } blendFunc = frameData->blendFunc; - isTween = frameData->isTween; + isTween = frameData->isTween; } } From 44b93f35486709168f4dcc79c377f16af9064228 Mon Sep 17 00:00:00 2001 From: 2youyou2 Date: Mon, 5 May 2014 17:46:06 +0800 Subject: [PATCH 3/3] change tab to 4 space --- cocos/editor-support/cocostudio/CCDatas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/editor-support/cocostudio/CCDatas.cpp b/cocos/editor-support/cocostudio/CCDatas.cpp index 14e0f942dd..df3ececb81 100644 --- a/cocos/editor-support/cocostudio/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/CCDatas.cpp @@ -290,7 +290,7 @@ void FrameData::copy(const BaseData *baseData) } } - blendFunc = frameData->blendFunc; + blendFunc = frameData->blendFunc; isTween = frameData->isTween; } }