diff --git a/vtkm/rendering/Mapper.h b/vtkm/rendering/Mapper.h index 366053a19..f8b3d1e7a 100644 --- a/vtkm/rendering/Mapper.h +++ b/vtkm/rendering/Mapper.h @@ -40,10 +40,10 @@ public: virtual void SetActiveColorTable(const vtkm::cont::ColorTable& ct); VTKM_DEPRECATED(1.6, "StartScene() does nothing") - virtual void StartScene() = 0; + void StartScene() {} VTKM_DEPRECATED(1.6, "EndScene() does nothing") - virtual void EndScene() = 0; + void EndScene() {} virtual void SetCanvas(vtkm::rendering::Canvas* canvas) = 0; virtual vtkm::rendering::Canvas* GetCanvas() const = 0; diff --git a/vtkm/rendering/MapperConnectivity.h b/vtkm/rendering/MapperConnectivity.h index 72192c752..65ad44365 100644 --- a/vtkm/rendering/MapperConnectivity.h +++ b/vtkm/rendering/MapperConnectivity.h @@ -37,12 +37,6 @@ public: const vtkm::rendering::Camera& camera, const vtkm::Range& scalarRange) override; - VTKM_DEPRECATED(1.6, "StartScene() does nothing") - virtual void StartScene() override {} - - VTKM_DEPRECATED(1.6, "EndScene() does nothing") - virtual void EndScene() override {} - vtkm::rendering::Mapper* NewCopy() const override; void CreateDefaultView(); diff --git a/vtkm/rendering/MapperCylinder.h b/vtkm/rendering/MapperCylinder.h index 89148fcb0..b74c0d508 100644 --- a/vtkm/rendering/MapperCylinder.h +++ b/vtkm/rendering/MapperCylinder.h @@ -68,12 +68,6 @@ public: const vtkm::rendering::Camera& camera, const vtkm::Range& scalarRange) override; - VTKM_DEPRECATED(1.6, "StartScene() does nothing") - virtual void StartScene() override {} - - VTKM_DEPRECATED(1.6, "EndScene() does nothing") - virtual void EndScene() override {} - void SetCompositeBackground(bool on); vtkm::rendering::Mapper* NewCopy() const override; diff --git a/vtkm/rendering/MapperPoint.h b/vtkm/rendering/MapperPoint.h index c20a8d20d..6f9bdb9ca 100644 --- a/vtkm/rendering/MapperPoint.h +++ b/vtkm/rendering/MapperPoint.h @@ -79,11 +79,6 @@ public: const vtkm::rendering::Camera& camera, const vtkm::Range& scalarRange) override; - VTKM_DEPRECATED(1.6, "StartScene() does nothing") - virtual void StartScene() override {} - - VTKM_DEPRECATED(1.6, "EndScene() does nothing") - virtual void EndScene() override {} void SetCompositeBackground(bool on); vtkm::rendering::Mapper* NewCopy() const override; diff --git a/vtkm/rendering/MapperQuad.h b/vtkm/rendering/MapperQuad.h index 577aec78e..e91630bf0 100644 --- a/vtkm/rendering/MapperQuad.h +++ b/vtkm/rendering/MapperQuad.h @@ -44,12 +44,6 @@ public: const vtkm::rendering::Camera& camera, const vtkm::Range& scalarRange) override; - VTKM_DEPRECATED(1.6, "StartScene() does nothing") - virtual void StartScene() override {} - - VTKM_DEPRECATED(1.6, "EndScene() does nothing") - virtual void EndScene() override {} - void SetCompositeBackground(bool on); vtkm::rendering::Mapper* NewCopy() const override; diff --git a/vtkm/rendering/MapperRayTracer.h b/vtkm/rendering/MapperRayTracer.h index 3d8c8f0f9..fd25bd650 100644 --- a/vtkm/rendering/MapperRayTracer.h +++ b/vtkm/rendering/MapperRayTracer.h @@ -38,12 +38,6 @@ public: const vtkm::rendering::Camera& camera, const vtkm::Range& scalarRange) override; - VTKM_DEPRECATED(1.6, "StartScene() does nothing") - virtual void StartScene() override {} - - VTKM_DEPRECATED(1.6, "EndScene() does nothing") - virtual void EndScene() override {} - void SetCompositeBackground(bool on); vtkm::rendering::Mapper* NewCopy() const override; void SetShadingOn(bool on); diff --git a/vtkm/rendering/MapperVolume.h b/vtkm/rendering/MapperVolume.h index cd7358b9d..cae4c0d9b 100644 --- a/vtkm/rendering/MapperVolume.h +++ b/vtkm/rendering/MapperVolume.h @@ -36,12 +36,6 @@ public: const vtkm::rendering::Camera& camera, const vtkm::Range& scalarRange) override; - VTKM_DEPRECATED(1.6, "StartScene() does nothing") - virtual void StartScene() override {} - - VTKM_DEPRECATED(1.6, "EndScene() does nothing") - virtual void EndScene() override {} - vtkm::rendering::Mapper* NewCopy() const override; void SetSampleDistance(const vtkm::Float32 distance); void SetCompositeBackground(const bool compositeBackground); diff --git a/vtkm/rendering/MapperWireframer.h b/vtkm/rendering/MapperWireframer.h index 97dd882df..acea29cca 100644 --- a/vtkm/rendering/MapperWireframer.h +++ b/vtkm/rendering/MapperWireframer.h @@ -42,12 +42,6 @@ public: bool GetIsOverlay() const; void SetIsOverlay(bool isOverlay); - VTKM_DEPRECATED(1.6, "StartScene() does nothing") - virtual void StartScene() override {} - - VTKM_DEPRECATED(1.6, "EndScene() does nothing") - virtual void EndScene() override {} - virtual void RenderCells(const vtkm::cont::DynamicCellSet& cellset, const vtkm::cont::CoordinateSystem& coords, const vtkm::cont::Field& scalarField,