From e313f7be8b275bb0a7379caca772b2ffb60f4508 Mon Sep 17 00:00:00 2001 From: XiaoFeng Date: Mon, 16 Nov 2015 15:56:23 +0800 Subject: [PATCH] Combine Studio change for ActionTimeline --- .../cocostudio/ActionTimeline/CCFrame.cpp | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp index 1cbc10f4b6..125b649936 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp @@ -618,20 +618,44 @@ void InnerActionFrame::onEnter(Frame *nextFrame, int currentFrameIndex) void InnerActionFrame::setStartFrameIndex(int frameIndex) { +#ifdef CC_STUDIO_ENABLED_VIEW // for cocostudio only + if (_enterWithName) + { + CCLOG(" cannot set start when enter frame with name. setEnterWithName false firstly!"); + throw std::exception(); + } +#else CCASSERT(!_enterWithName, " cannot setStartFrameIndex when enterWithName is set"); +#endif _startFrameIndex = frameIndex; } void InnerActionFrame::setEndFrameIndex(int frameIndex) { +#ifdef CC_STUDIO_ENABLED_VIEW // for cocostudio only + if (_enterWithName) + { + CCLOG(" cannot set end when enter frame with name. setEnterWithName false firstly!"); + throw std::exception(); + } +#else CCASSERT(!_enterWithName, " cannot setEndFrameIndex when enterWithName is set"); +#endif _endFrameIndex = frameIndex; } void InnerActionFrame::setAnimationName(const std::string& animationName) { +#ifdef CC_STUDIO_ENABLED_VIEW // for cocostudio only + if (!_enterWithName) + { + CCLOG(" cannot set aniamtioname when enter frame with index. setEnterWithName true firstly!"); + throw std::exception(); + } +#else CCASSERT(_enterWithName, " cannot set aniamtioname when enter frame with index. setEnterWithName true firstly!"); +#endif _animationName = animationName; }