Render HudTrails with alpha correctly again.
Fixup a couple of merge issues in RendererGL2.cpp