fixed bugs, which may cause shader linking failed
fixed bugs
Merge branch 'develop'