]> SALOME platform Git repositories - tools/configuration.git/commitdiff
Salome HOME
Add patch for paraview: #18427 [CEA 18409] "Resample to image" - ParaView crash fixes_for_950
authorrnv <rnv@opencascade.com>
Tue, 23 Jun 2020 15:45:53 +0000 (18:45 +0300)
committerrnv <rnv@opencascade.com>
Tue, 23 Jun 2020 15:45:53 +0000 (18:45 +0300)
config/patches/paraview.0009-ParaView_volume_mapper.patch [new file with mode: 0644]
config/salome.xml

diff --git a/config/patches/paraview.0009-ParaView_volume_mapper.patch b/config/patches/paraview.0009-ParaView_volume_mapper.patch
new file mode 100644 (file)
index 0000000..2b424ee
--- /dev/null
@@ -0,0 +1,11 @@
+--- ParaView_origin/VTK/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx    2020-06-18 14:59:43.630941741 +0200
++++ ParaView/VTK/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx   2020-06-18 15:00:57.582622827 +0200
+@@ -2822,7 +2822,7 @@
+     this->VolumePropertyChanged |= property->GetMTime() > this->ShaderBuildTime.GetMTime();
+     auto it = this->Parent->AssembledInputs.find(port);
+-    if (it == this->Parent->AssembledInputs.cend())
++    if (it == this->Parent->AssembledInputs.cend() || it->second.Volume != vol)
+     {
+       // Create new input structure
+       auto texture = vtkSmartPointer<vtkVolumeTexture>::New();
index 6b390971b0a57ba161e0a9881f4eb82a99ee45f6..7d784e0f33ea810e319a9dd7d73140622d4c6427 100644 (file)
@@ -89,6 +89,7 @@
       <patch comment="Patch for ParaView libxml2's detection procedure" name="paraview.0006-ParaView_find_libxml2.patch" sha1="adc67576f12ca3b6abc06be2960495029c24c2a6" />
       <patch comment="Patch for ParaView freetype's detection procedure" name="paraview.0007-ParaView_find_freetype.patch" sha1="58a8b25b56fb325134129445c2ac90d7d4115980" />
       <patch comment="Patch to fix ParaView bug with rendering coincident topology" name="paraview.0008-ParaView_coincident_rendering.patch" sha1="45f74561b5301187bd73ee10f0c266c1345c8666" />
+      <patch comment="Patch for volume mapper (fix crash)" name="paraview.0009-ParaView_volume_mapper.patch" sha1="a14b75914c76d15897e470c2948cb8fea9377f5a" />
     </patches>
   </product>
   <product name="pillow" version="7.1.1" />