From: rnv <rnv@opencascade.com>
Date: Thu, 20 Jul 2017 08:57:20 +0000 (+0300)
Subject: Merge 'master' branch into V9_dev
X-Git-Tag: V9_0_0~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5477281064a251c8c523562038bbdeb771d2ff93;hp=24a8ff3366a0b466bc2c05f64c6e38b15dfcaeda;p=modules%2Fparavis.git

Merge 'master' branch into V9_dev
---

diff --git a/src/Plugins/MEDReader/IO/module.cmake b/src/Plugins/MEDReader/IO/module.cmake
index 5363aad1..7ac6c484 100644
--- a/src/Plugins/MEDReader/IO/module.cmake
+++ b/src/Plugins/MEDReader/IO/module.cmake
@@ -7,6 +7,5 @@ vtk_module(vtkMEDReader
     vtkRenderingCore
     vtkTestingRendering
     vtkInteractionStyle
-    #vtkRenderingFreeTypeOpenGL
   EXCLUDE_FROM_WRAP_HIERARCHY
 )
diff --git a/src/Plugins/MEDReader/Test/Baselines/testMEDReader0.png b/src/Plugins/MEDReader/Test/Baselines/testMEDReader0.png
index d4967f92..86ef73da 100644
Binary files a/src/Plugins/MEDReader/Test/Baselines/testMEDReader0.png and b/src/Plugins/MEDReader/Test/Baselines/testMEDReader0.png differ
diff --git a/src/Plugins/MEDReader/Test/Baselines/testMEDReader10.png b/src/Plugins/MEDReader/Test/Baselines/testMEDReader10.png
index 4bab2af8..4f0907df 100644
Binary files a/src/Plugins/MEDReader/Test/Baselines/testMEDReader10.png and b/src/Plugins/MEDReader/Test/Baselines/testMEDReader10.png differ
diff --git a/src/Plugins/MEDReader/Test/Baselines/testMEDReader11.png b/src/Plugins/MEDReader/Test/Baselines/testMEDReader11.png
index fdc1ac74..cb584d10 100644
Binary files a/src/Plugins/MEDReader/Test/Baselines/testMEDReader11.png and b/src/Plugins/MEDReader/Test/Baselines/testMEDReader11.png differ
diff --git a/src/Plugins/MEDReader/Test/Baselines/testMEDReader2.png b/src/Plugins/MEDReader/Test/Baselines/testMEDReader2.png
index d4b019a5..3489d127 100644
Binary files a/src/Plugins/MEDReader/Test/Baselines/testMEDReader2.png and b/src/Plugins/MEDReader/Test/Baselines/testMEDReader2.png differ
diff --git a/src/Plugins/MEDReader/Test/testMEDReader7.py b/src/Plugins/MEDReader/Test/testMEDReader7.py
index 61b5f182..29c660fc 100644
--- a/src/Plugins/MEDReader/Test/testMEDReader7.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader7.py
@@ -108,5 +108,5 @@ baseline_file = os.path.join(baselinePath, "testMEDReader7.png")
 import vtk.test.Testing
 vtk.test.Testing.VTK_TEMP_DIR = vtk.util.misc.vtkGetTempDir()
 vtk.test.Testing.compareImage(GetActiveView().GetRenderWindow(), baseline_file,
-                                                            threshold=1)
+                                                            threshold=6)
 vtk.test.Testing.interact()
diff --git a/test/standalone/gui/CMakeLists.txt b/test/standalone/gui/CMakeLists.txt
index e277b998..a0be3238 100644
--- a/test/standalone/gui/CMakeLists.txt
+++ b/test/standalone/gui/CMakeLists.txt
@@ -72,6 +72,6 @@ ADD_EXECUTABLE(paraLight
     ${pl_FORMS_HEADERS}
     ${rcs_sources})
     
-TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle)#vtkRenderingFreeTypeOpenGL)
+TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle)
 #INSTALL(TARGET paraLight bin)