revising erro indent
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3785 from yuye-liu/particle_designer_2

Particle designer 2[ci skip]