Commit a4f61d28 authored by Dan Lipsa's avatar Dan Lipsa Committed by Code Review
Browse files

Merge topic 'map-scalars-14943' into master

8c7db600 FIX: We don't select 2D annotations.
parents c361d68c 8c7db600
......@@ -98,6 +98,11 @@ public:
for (iter = dataMap.begin(); iter != dataMap.end(); ++iter)
{
const PixelInformation &key = iter->first;
if (! key.Prop)
{
// we don't select 2D annotations
continue;
}
const std::set<vtkIdType> &id_values = iter->second;
vtkSelectionNode* child = vtkSelectionNode::New();
child->SetContentType(vtkSelectionNode::INDICES);
......@@ -613,7 +618,7 @@ vtkHardwareSelector::PixelInformation vtkHardwareSelector::GetPixelInformation(
actorid--;
info.PropID = actorid;
info.Prop = this->Internals->Props[actorid];
info.Prop = this->GetPropFromID(actorid);
int composite_id = this->Convert(display_position,
this->PixBuffer[COMPOSITE_INDEX_PASS]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment