r2: fixed sun/moon rendering
Merge branch 'master' into sdl2
fixed possible crash issue