Merge branch 'V8_3_BR' into gdd/python3_dev

diff --git a/doc/dev/conf.py.in b/doc/dev/conf.py.in
index 6f2a0643a43aa847165e151b782c14043f24471d..9561b39e816fcb1e1c10407f88f66ad2f8057606 100644 (file)
--- a/doc/dev/conf.py.in
+++ b/doc/dev/conf.py.in
@@ -47,7 +47,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'PARAVIS, Module architecture - Conception'
-copyright = '2010-2016 CEA/DEN, EDF R&D, A. Bruneton'
+copyright = '2010-2017 CEA/DEN, EDF R&D, A. Bruneton'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/doc/doxygen/static/footer.html b/doc/doxygen/static/footer.html
index 91afd6cc8ab252063767ab204030ae63dd6ee52b..7cf11feba01a088027958a2e4c7639c64f7adb19 100755 (executable)
--- a/doc/doxygen/static/footer.html
+++ b/doc/doxygen/static/footer.html
@@ -4,7 +4,7 @@
   <ul>
     $navpath
     <li class="footer">
-      Copyright &copy; 2007-2016  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
+      Copyright &copy; 2007-2017  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
       Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
     </li>
   </ul>

diff --git a/src/PV_SWIG/presentations.py b/src/PV_SWIG/presentations.py
index c9b4c044711742c3a8e48e58d34b96e937a88891..3c05d6ec812e7e982fe9124cad6cd81e3ac949c7 100644 (file)
--- a/src/PV_SWIG/presentations.py
+++ b/src/PV_SWIG/presentations.py
@@ -2315,7 +2315,7 @@ def GaussPointsOnField1(proxy, entity, field_name,
     proxy.UpdatePipeline(time=time_value)
 
     # Create Gauss Points object
-    source = pvs.GaussPoints(proxy)
+    source = pvs.ELGAfieldToPointSprite(proxy)
     source.UpdatePipeline()
 
     # Get Gauss Points representation object