prevent raise error from raising error

This commit is contained in:
Matt Larsen 2020-03-11 14:56:42 -07:00
parent 2796dc33d2
commit bf3ebaa1c7

@ -520,6 +520,8 @@ public:
vtkm::Id cellId = currentCell;
vtkm::exec::FunctorBase fake_functor;
while (!valid_cell)
{
// push forward and look for a new cell
@ -528,7 +530,8 @@ public:
query_distance += bumpDistance;
vtkm::Vec<FloatType, 3> location = origin + rdir * (query_distance);
vtkm::Vec<vtkm::FloatDefault, 3> pcoords;
locator->FindCell(location, cellId, pcoords, *this);
locator->FindCell(location, cellId, pcoords, fake_functor);
}
currentCell = cellId;
@ -1087,12 +1090,13 @@ public:
const vtkm::Id colorMapSize = colorMap.GetNumberOfValues();
const vtkm::Int32 cellShape = meshConn.GetCellShape(currentCell);
vtkm::exec::FunctorBase fake_functor;
while (enterDistance <= currentDistance && currentDistance <= exitDistance)
{
vtkm::Vec<FloatType, 3> sampleLoc = origin + currentDistance * dir;
vtkm::Float32 lerpedScalar;
bool validSample =
Sampler.SampleCell(points, scalars, sampleLoc, lerpedScalar, *this, cellShape);
Sampler.SampleCell(points, scalars, sampleLoc, lerpedScalar, fake_functor, cellShape);
if (!validSample)
{
//