From bf3ebaa1c7ca0cf48aeb78e2a80aba6dafb71421 Mon Sep 17 00:00:00 2001
From: Matt Larsen <larsen30@llnl.gov>
Date: Wed, 11 Mar 2020 14:56:42 -0700
Subject: [PATCH] prevent raise error from raising error

---
 vtkm/rendering/raytracing/ConnectivityTracer.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vtkm/rendering/raytracing/ConnectivityTracer.cxx b/vtkm/rendering/raytracing/ConnectivityTracer.cxx
index 40a0ae191..2307e7f24 100644
--- a/vtkm/rendering/raytracing/ConnectivityTracer.cxx
+++ b/vtkm/rendering/raytracing/ConnectivityTracer.cxx
@@ -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)
       {
         //