diff --git a/widgets/glWidget/QtBaseViewer.cc b/widgets/glWidget/QtBaseViewer.cc index 154c09ac186b25fd69f7176aa2490fa5f2d510e1..de80b4963f3db843606ecec06cb8f2a4768f2283 100644 --- a/widgets/glWidget/QtBaseViewer.cc +++ b/widgets/glWidget/QtBaseViewer.cc @@ -605,12 +605,12 @@ void glViewer::drawScene_mono() } ACG::SceneGraph::DrawAction action( properties_.drawMode() , false); - ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action, *glstate_, properties_.drawMode() ); + ACG::SceneGraph::traverse(sceneGraphRoot_, action, *glstate_, properties_.drawMode() ); if( blending_ ) { ACG::SceneGraph::DrawAction action(properties_.drawMode(), true); - ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action, *glstate_, properties_.drawMode()); + ACG::SceneGraph::traverse(sceneGraphRoot_, action, *glstate_, properties_.drawMode()); } if (oM) @@ -698,7 +698,7 @@ void glViewer::drawScene_mono() // do the picking glstate_->pick_init (true); ACG::SceneGraph::PickAction action(*glstate_, properties_.renderPickingMode(), properties_.drawMode()); - ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action,*glstate_); + ACG::SceneGraph::traverse(sceneGraphRoot_, action,*glstate_); glEnable(GL_LIGHTING); glEnable(GL_BLEND); diff --git a/widgets/glWidget/QtBaseViewerPicking.cc b/widgets/glWidget/QtBaseViewerPicking.cc index 81e75b39f3dc5efde7598fb629335a9aa1589427..8da463c9a77ad54918c0a9d44b4bb474e145e0cd 100644 --- a/widgets/glWidget/QtBaseViewerPicking.cc +++ b/widgets/glWidget/QtBaseViewerPicking.cc @@ -184,7 +184,7 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget, // do the picking ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); - ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action,properties_.glState() ); + ACG::SceneGraph::traverse(sceneGraphRoot_, action,properties_.glState() ); // restore GL state glMatrixMode( GL_PROJECTION ); @@ -446,7 +446,7 @@ bool glViewer::pickGL( ACG::SceneGraph::PickTarget _pickTarget, // do the picking ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); - ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action, properties_.glState()); + ACG::SceneGraph::traverse(sceneGraphRoot_, action, properties_.glState()); int hits = glRenderMode(GL_RENDER); // restore GL state @@ -579,7 +579,7 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg // do the picking ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); - ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action,properties_.glState()); + ACG::SceneGraph::traverse(sceneGraphRoot_, action,properties_.glState()); // restore GL state glMatrixMode( GL_PROJECTION );