diff --git a/CMakeExternals/VTK-8.1.0.patch b/CMakeExternals/VTK-8.1.0.patch
index 2082d02688..7dc68def65 100644
--- a/CMakeExternals/VTK-8.1.0.patch
+++ b/CMakeExternals/VTK-8.1.0.patch
@@ -1,80 +1,93 @@
 diff --git a/Rendering/Core/vtkAssembly.cxx b/Rendering/Core/vtkAssembly.cxx
 index 79e4d42b65..b17c74e659 100644
 --- a/Rendering/Core/vtkAssembly.cxx
 +++ b/Rendering/Core/vtkAssembly.cxx
 @@ -116,6 +116,7 @@ int vtkAssembly::RenderTranslucentPolygonalGeometry(vtkViewport *ren)
      vtkProp3D* prop3D = static_cast<vtkProp3D *>(path->GetLastNode()->GetViewProp());
      if ( prop3D->GetVisibility() )
      {
 +      prop3D->SetPropertyKeys(this->GetPropertyKeys());
        prop3D->SetAllocatedRenderTime(fraction, ren);
        prop3D->PokeMatrix(path->GetLastNode()->GetMatrix());
        renderedSomething += prop3D->RenderTranslucentPolygonalGeometry(ren);
 @@ -143,6 +144,7 @@ int vtkAssembly::HasTranslucentPolygonalGeometry()
      vtkProp3D* prop3D = static_cast<vtkProp3D *>(path->GetLastNode()->GetViewProp());
      if ( prop3D->GetVisibility() )
      {
 +      prop3D->SetPropertyKeys(this->GetPropertyKeys());
        result = prop3D->HasTranslucentPolygonalGeometry();
      }
    }
 @@ -175,6 +177,7 @@ int vtkAssembly::RenderVolumetricGeometry(vtkViewport *ren)
      vtkProp3D* prop3D = static_cast<vtkProp3D *>(path->GetLastNode()->GetViewProp());
      if (prop3D->GetVisibility())
      {
 +      prop3D->SetPropertyKeys(this->GetPropertyKeys());
        prop3D->SetAllocatedRenderTime(fraction, ren);
        prop3D->PokeMatrix(path->GetLastNode()->GetMatrix());
        renderedSomething += prop3D->RenderVolumetricGeometry(ren);
 @@ -210,6 +213,7 @@ int vtkAssembly::RenderOpaqueGeometry(vtkViewport *ren)
      vtkProp3D* prop3D = static_cast<vtkProp3D *>(path->GetLastNode()->GetViewProp());
      if (prop3D->GetVisibility())
      {
 +      prop3D->SetPropertyKeys(this->GetPropertyKeys());
        prop3D->PokeMatrix(path->GetLastNode()->GetMatrix());
        prop3D->SetAllocatedRenderTime(fraction, ren);
        renderedSomething += prop3D->RenderOpaqueGeometry(ren);
 diff --git a/Rendering/Core/vtkPropAssembly.cxx b/Rendering/Core/vtkPropAssembly.cxx
 index 5033c3b66e..405b1a75ab 100644
 --- a/Rendering/Core/vtkPropAssembly.cxx
 +++ b/Rendering/Core/vtkPropAssembly.cxx
 @@ -97,6 +97,7 @@ int vtkPropAssembly::RenderTranslucentPolygonalGeometry(vtkViewport *ren)
      prop = path->GetLastNode()->GetViewProp();
      if ( prop->GetVisibility() )
      {
 +      prop->SetPropertyKeys(this->GetPropertyKeys());
        prop->SetAllocatedRenderTime(fraction, ren);
        prop->PokeMatrix(path->GetLastNode()->GetMatrix());
        renderedSomething += prop->RenderTranslucentPolygonalGeometry(ren);
 @@ -125,6 +126,7 @@ int vtkPropAssembly::HasTranslucentPolygonalGeometry()
      prop = path->GetLastNode()->GetViewProp();
      if ( prop->GetVisibility() )
      {
 +      prop->SetPropertyKeys(this->GetPropertyKeys());
        result=prop->HasTranslucentPolygonalGeometry();
      }
    }
 @@ -154,6 +156,7 @@ int vtkPropAssembly::RenderVolumetricGeometry(vtkViewport *ren)
      prop = path->GetLastNode()->GetViewProp();
      if ( prop->GetVisibility() )
      {
 +      prop->SetPropertyKeys(this->GetPropertyKeys());
        prop->SetAllocatedRenderTime(fraction, ren);
        prop->PokeMatrix(path->GetLastNode()->GetMatrix());
        renderedSomething += prop->RenderVolumetricGeometry(ren);
 @@ -186,6 +189,7 @@ int vtkPropAssembly::RenderOpaqueGeometry(vtkViewport *ren)
      prop = path->GetLastNode()->GetViewProp();
      if ( prop->GetVisibility() )
      {
 +      prop->SetPropertyKeys(this->GetPropertyKeys());
        prop->SetAllocatedRenderTime(fraction, ren);
        prop->PokeMatrix(path->GetLastNode()->GetMatrix());
        renderedSomething += prop->RenderOpaqueGeometry(ren);
 @@ -217,6 +221,7 @@ int vtkPropAssembly::RenderOverlay(vtkViewport *ren)
      prop = path->GetLastNode()->GetViewProp();
      if ( prop->GetVisibility() )
      {
 +      prop->SetPropertyKeys(this->GetPropertyKeys());
        prop->SetAllocatedRenderTime(fraction, ren);
        prop->PokeMatrix(path->GetLastNode()->GetMatrix());
        renderedSomething += prop->RenderOverlay(ren);
+diff --git a/CMake/VTKGenerateExportHeader.cmake b/CMake/VTKGenerateExportHeader.cmake
+index 9a7a76386e..4b5b6855d0 100644
+--- a/CMake/VTKGenerateExportHeader.cmake
++++ b/CMake/VTKGenerateExportHeader.cmake
+@@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibility)
+     execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+       OUTPUT_VARIABLE _gcc_version_info
+       ERROR_VARIABLE _gcc_version_info)
+-    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++    string(REGEX MATCH "([3-9]|10)\\.[0-9]\\.[0-9]*"
+       _gcc_version "${_gcc_version_info}")
+     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+     # patch level, handle this here: