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

Merge pull request #7808 from 2youyouo2/v3 

fixed ArmatureAnimation::setSpeedScale
This commit is contained in:
minggo 2014-08-18 18:19:23 +08:00
parent e2829cd68a 6abaf27b14
commit 2f2ee43b21
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/CCArmatureAnimation.cpp
View File

@ -153,7 +153,7 @@ void ArmatureAnimation::setSpeedScale(float speedScale)
bone->getTween()->setProcessScale(_processScale); bone->getTween()->setProcessScale(_processScale);
if (bone->getChildArmature()) if (bone->getChildArmature())
{ {
bone->getChildArmature()->getAnimation()->setProcessScale(_processScale); bone->getChildArmature()->getAnimation()->setSpeedScale(_processScale);
} }
} }
} }
@ -228,7 +228,7 @@ void ArmatureAnimation::play(const std::string& animationName, int durationTo,
if (bone->getChildArmature()) if (bone->getChildArmature())
{ {
bone->getChildArmature()->getAnimation()->setProcessScale(_processScale); bone->getChildArmature()->getAnimation()->setSpeedScale(_processScale);
} }
} }
else else