Correct OpenGL Route/Waypoint rendering logic
Merge branch 'master' of github.com:OpenCPN/OpenCPN