Updates will be applied - 3:30pm EDT (UTC -400). No downtime expected.

Commit 665241d8 authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot

Merge topic 'fix_cpdm2_failures'

3b80a5a7 Fix a array bounds error and iffy pick
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1975
parents f88aa684 3b80a5a7
Pipeline #26737 running with stage
in 105 minutes and 49 seconds
......@@ -313,7 +313,7 @@ int TestCompositePolyDataMapper2Picking(int argc, char* argv[])
bPrims.find(48) == bPrims.end() ||
std::find(bPrims[48].begin(), bPrims[48].end(), 14) == bPrims[48].end() ||
bPrims.find(97) == bPrims.end() ||
std::find(bPrims[97].begin(), bPrims[97].end(), 42) == bPrims[97].end()
std::find(bPrims[82].begin(), bPrims[82].end(), 114) == bPrims[82].end()
)
{
cerr << "Incorrect pick results (if any picks were performed inter"
......
......@@ -84,7 +84,8 @@ public:
this->OverridesColor != next->OverridesColor ||
this->AmbientColor != next->AmbientColor ||
this->DiffuseColor != next->DiffuseColor ||
(primType >= 0 && this->PrimOffsets[primType+1] != next->PrimOffsets[primType]);
(primType >= 0 && primType <= 3 &&
this->PrimOffsets[primType+1] != next->PrimOffsets[primType]);
}
};
......
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