From 1454e9c7608049fdc1d551d9b4bf969c1aefe175 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 7 Feb 2012 10:51:22 +0000 Subject: [PATCH] From Tamer Fahmy, Fix for bug when scrolling down and using render on demand. "Currently issuing a mouse scroll DOWN event would stop updating animations in progress. The fix consists of changing the line us.requestContinuousUpdate( false ); to: us.requestContinuousUpdate( isAnimating() || _thrown ); in OrbitManipulator::handleMouseWheel() as has been done for the GUIEventAdapter::SCROLL_UP case a couple of lines earlier or in src/osgGA/FirstPersonManipulator.cpp." --- src/osgGA/OrbitManipulator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgGA/OrbitManipulator.cpp b/src/osgGA/OrbitManipulator.cpp index e4f31bb91..0df95d145 100644 --- a/src/osgGA/OrbitManipulator.cpp +++ b/src/osgGA/OrbitManipulator.cpp @@ -261,7 +261,7 @@ bool OrbitManipulator::handleMouseWheel( const GUIEventAdapter& ea, GUIActionAda // perform zoom zoomModel( -_wheelZoomFactor, true ); us.requestRedraw(); - us.requestContinuousUpdate( false ); + us.requestContinuousUpdate( isAnimating() || _thrown ); return true; }