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

Merge pull request #11650 from xiaofeng11/v3.6 

Fix a logical bug that may cause null pointer been used
This commit is contained in:
minggo 2015-04-29 16:21:17 +08:00
parent dd4a285c2d 9d0741544c
commit 9586cdf2c8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
View File

@ -400,7 +400,7 @@ void PositionFrame::onEnter(Frame *nextFrame, int currentFrameIndex)
void PositionFrame::onApply(float percent) void PositionFrame::onApply(float percent)
{ {
if (nullptr != _node && _betweenX != 0 || _betweenY != 0) if (nullptr != _node && (_betweenX != 0 || _betweenY != 0))
{ {
Point p; Point p;
p.x = _position.x + _betweenX * percent; p.x = _position.x + _betweenX * percent;