score bug fix
Merge branch 'Windows' into Linux
material fix
yes