Changeset 6423 for geovis

Timestamp:

Jul 8, 2016 10:13:25 AM (8 years ago)

Author:

ldelgass

Message:

Remove nodes from hovered/selected list on removing from scene

File:

• geovis/trunk/Renderer.cpp (modified) (2 diffs)

geovis/trunk/Renderer.cpp

@@ -1786 +1786 @@
     for (std::vector<osg::Node *>::iterator itr = toRemove.begin();
          itr != toRemove.end(); ++itr) {
+        if (_hovered.find(*itr) != _hovered.end()) {
+            _hovered.erase(*itr);
+        }
+        if (_selected.find(*itr) != _selected.end()) {
+            _selected.erase(*itr);
+        }
         nodes->removeChild(*itr);
     }
@@ -2177 +2183 @@
              itr != fired.end(); ++itr) {
             (*itr)->clearDecoration();
-            _placeNodes->removeChild(*itr);
             if (_hovered.find(*itr) != _hovered.end()) {
                 _hovered.erase(*itr);
             }
+            if (_selected.find(*itr) != _selected.end()) {
+                _selected.erase(*itr);
+            }
+           _placeNodes->removeChild(*itr);
         }
     } else {