From 546f188d17adf1201d294245c8fb565cd63aa1da Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Tue, 29 Jan 2013 22:33:00 +0000 Subject: [PATCH] Small change to reflect the change of interface of the trackball --- src/meshlab/glarea.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp index 8ba8030ac..309003452 100644 --- a/src/meshlab/glarea.cpp +++ b/src/meshlab/glarea.cpp @@ -289,7 +289,7 @@ void GLArea::drawLight() // Apply the trackball for the light direction glPushMatrix(); trackball_light.GetView(); - trackball_light.Apply(!(isDefaultTrackBall())); + trackball_light.Apply(); static float lightPosF[]={0.0,0.0,1.0,0.0}; glLightfv(GL_LIGHT0,GL_POSITION,lightPosF); @@ -312,6 +312,7 @@ void GLArea::drawLight() glPopAttrib(); } glPopMatrix(); + if(!isDefaultTrackBall()) trackball_light.DrawPostApply(); } @@ -353,7 +354,7 @@ void GLArea::paintEvent(QPaintEvent */*event*/) // Finally apply the Trackball for the model trackball.GetView(); - trackball.Apply(false); + trackball.Apply(); glPushMatrix(); //glScale(d);