Water and glass issues

[michaelb]

It the same issue as Multi coloured glass so we made it opaque to mask it.