FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'OpenSceneGraph-3.6' into MultiView

Browse Source
This commit is contained in:
Robert Osfield 2021-02-19 12:20:47 +00:00
commit 518c4f7cbc
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgWidget/WindowManager.cpp
View File

@ -318,9 +318,6 @@ bool WindowManager::pickAtXY(float x, float y, WidgetList& wl)
// to that Window. // to that Window.
for(Intersections::iterator i = intr.begin(); i != intr.end(); i++) { for(Intersections::iterator i = intr.begin(); i != intr.end(); i++) {
Widget* widget = dynamic_cast<Widget*>(i->drawable.get());
if(!widget) continue;
Window* win = 0; Window* win = 0;
const osg::NodePath& nodePath = i->nodePath; const osg::NodePath& nodePath = i->nodePath;
for(osg::NodePath::const_reverse_iterator np_itr = nodePath.rbegin(); np_itr != nodePath.rend(); ++np_itr) for(osg::NodePath::const_reverse_iterator np_itr = nodePath.rbegin(); np_itr != nodePath.rend(); ++np_itr)
@ -345,6 +342,8 @@ bool WindowManager::pickAtXY(float x, float y, WidgetList& wl)
// If we've found a new Widnow, break out! // If we've found a new Widnow, break out!
else if(activeWin != win) break; else if(activeWin != win) break;
Widget* widget = dynamic_cast<Widget*>(i->drawable.get());
if(!widget) continue;
// We need to return a list of every Widget that was picked, so // We need to return a list of every Widget that was picked, so
// that the handler can operate on it accordingly. // that the handler can operate on it accordingly.