rename deprecated types
remove compile warning
remove compile warning in sprite3D.cpp
Merge branch 'v3.1' into v3.1copy
Merge branch 'v3.1copy' into v3.1
fix compile warning