Check if pick target in cache is the requested one

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6814 383ad7c9-94d9-4d36-a494-682f7c89f535

widgets/glWidget/QtBaseViewer.hh

@@ -801,6 +801,9 @@ private:
     /// Should the pick cache be updated
     bool updatePickCache_;
 
+    /// Pick target stored in pick cache
+    ACG::SceneGraph::PickTarget pickCacheTarget_;
+
     /// Is pick caching supported
     bool pickCacheSupported_;
 

widgets/glWidget/QtBaseViewerPicking.cc

@@ -245,6 +245,7 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
   {
     pickCache_->release ();
     updatePickCache_ = false;
+    pickCacheTarget_ = _pickTarget;
   }
 
   // get first found pixel
@@ -294,7 +295,8 @@ int glViewer::pickFromCache( ACG::SceneGraph::PickTarget _pickTarget,
                              ACG::Vec3d*                 _hitPointPtr )
 {
   // do we need an update?
-  if (!pickCacheSupported_ || updatePickCache_ || !pickCache_)
+  if (!pickCacheSupported_ || updatePickCache_ || !pickCache_ ||
+      pickCacheTarget_ != _pickTarget)
     return -1;
 
   GLint         x = _mousePos.x() - scenePos().x(),