From d2342625854d08bdeb5aa62ed7a46726ed453289 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 9 Jun 2014 13:46:44 +0000 Subject: [PATCH] Fixed handling of Drawable callbacks and NumChildrenRequiringEventTraversal git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14248 16af8721-9629-0410-8352-f15c8da7e697 --- include/osgGA/EventVisitor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/osgGA/EventVisitor b/include/osgGA/EventVisitor index 77712555a..fb1aa8dd9 100644 --- a/include/osgGA/EventVisitor +++ b/include/osgGA/EventVisitor @@ -75,11 +75,11 @@ class OSGGA_EXPORT EventVisitor : public osg::NodeVisitor osg::Callback* callback = drawable.getEventCallback(); if (callback) { - osg::Drawable::UpdateCallback* drawable_callback = dynamic_cast(callback); + osg::Drawable::EventCallback* drawable_callback = dynamic_cast(callback); osg::NodeCallback* node_callback = dynamic_cast(callback); osg::CallbackObject* callback_object = dynamic_cast(callback); - if (drawable_callback) drawable_callback->update(this,&drawable); + if (drawable_callback) drawable_callback->event(this,&drawable); if (node_callback) (*node_callback)(&drawable, this); if ((!drawable_callback && !node_callback) || callback_object) callback_object->run(&drawable, this); @@ -120,7 +120,7 @@ class OSGGA_EXPORT EventVisitor : public osg::NodeVisitor osg::Callback* callback = node.getEventCallback(); if (callback) callback->run(&node,this); - else if (node.getNumChildrenRequiringUpdateTraversal()>0) traverse(node); + else if (node.getNumChildrenRequiringEventTraversal()>0) traverse(node); }