Hi Riccardo,
I've merged the following changes from your submissions
$ svn diff
Index: src/osgViewer/Viewer.cpp
===================================================================
--- src/osgViewer/Viewer.cpp (revision 12975)
+++ src/osgViewer/Viewer.cpp (working copy)
@@ -954,7 +954,7 @@
hitr != _eventHandlers.end();
++hitr)
{
- (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask(
*event, *this, 0, 0);
+ (*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask(
*event, *this, 0, _eventVisitor);
}
}
Index: src/osgViewer/CompositeViewer.cpp
===================================================================
--- src/osgViewer/CompositeViewer.cpp (revision 12975)
+++ src/osgViewer/CompositeViewer.cpp (working copy)
@@ -1037,7 +1037,7 @@
hitr != view->getEventHandlers().end();
++hitr)
{
-
(*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *view,
0, 0);
+
(*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *view,
0, _eventVisitor);
}
}
}
There were other differences between your code submission and
svn/trunk versions but I guess this is done to you not using svn/trunk
as your base, so have assumed it's only these changes that are
appropriate to merge. The above changes are now merged and submitted
to svn/trunk.
Robert.
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
