Commit 03ae2774 authored by Julien Jomier's avatar Julien Jomier Committed by Code Review
Browse files

Merge topic 'AreaPicker-Assembly-Bug' into master

507d690b BUG: AreaPicker doesn't consider position/orientation of assembly
parents 1d56daba 507d690b
......@@ -250,19 +250,20 @@ int vtkAreaPicker::PickProps(vtkRenderer *renderer)
{
if ( mapper )
{
double *bds = propCandidate->GetBounds();
propCandidate->PokeMatrix(path->GetLastNode()->GetMatrix());
double* bds = propCandidate->GetBounds();
propCandidate->PokeMatrix(NULL);
for (int i = 0; i < 6; i++)
{
bounds[i] = bds[i];
}
double dist;
//cerr << "mapper ABFISECT" << endl;
if (this->ABoxFrustumIsect(bounds, dist))
{
if ( ! this->Prop3Ds->IsItemPresent(prop) )
{
this->Prop3Ds->AddItem(static_cast<vtkProp3D *>(prop));
//cerr << "picked a mapper" << endl;
if (dist < mindist) //new nearest, remember it
{
mindist = dist;
......
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