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

Merge branch 'v3' of github.com:super626/cocos2d-x into v3 

Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
This commit is contained in:
lvlong 2015-03-31 14:57:43 +08:00
parent 336e719a2f 4e03c62b03
commit 044376be7e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View File

@ -2388,7 +2388,7 @@ NodeAnimationTest::NodeAnimationTest()
int tIndex = _vectorIndex - 1;
if(tIndex < 0)
_vectorIndex = (int)_sprites.size() - 1;
_vectorIndex = (int)_sprites.size()-1;
else
_vectorIndex--;