Fixed merge error

master
Marius Kintel 2015-01-07 23:55:38 -05:00
parent c8097c411e
commit 6e0d94ec44
1 changed files with 1 additions and 1 deletions

View File

@ -506,7 +506,7 @@ void GLView::showCrosshairs()
void GLView::showScalemarkers(const Color4f &col)
{
// Add scale tics on large axes
double l = cam.projection == Camera::PERSPECTIVE ? cam.viewer_distance : cam.height;
double l = cam.zoomValue();
glLineWidth(this->getDPI());
glColor3f(col[0], col[1], col[2]);