Merge pull request #4774 from houguohua/3d-extension

material
Merge pull request #4775 from houguohua/3d-extension

geo
Merge branch '3d-extension' of github.com:houguohua/cocos2d-x into 3d-extension
Merge branch '3d-extension' of github.com:houguohua/cocos2d-x into 3d-extension
Merge branch '3d-extension' of github.com:houguohua/cocos2d-x into 3d-extension