Merged-in terrain shader shuffle/cleanup from prerelease More water code cleanups + micro opts Touched a few shaders just to be sure