From 48e4c0a02da2fcccdfb13cd5887d66681c1ef8ec Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Wed, 6 Nov 2019 09:53:18 +0300
Subject: [PATCH 1/3] Increment version: 9.4.0

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ce9d649e..27725d7f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,11 +33,11 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Common CMake macros
 # ===================

From 627494a5b0c4642613bf0ba2790a1a13004dc266 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Wed, 13 Nov 2019 14:50:13 +0300
Subject: [PATCH 2/3] Fix broken link in Developer documentation

---
 doc/salome/tui/doxyfile.in     | 1 -
 doc/salome/tui/input/index.doc | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index 39efd76c0..31839eae5 100644
--- a/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@ -76,7 +76,6 @@ WARN_LOGFILE           =
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = @PROJECT_SOURCE_DIR@/src \
-			 ./geomBuilder.py \
 			 @PROJECT_SOURCE_DIR@/bin \
 			 @PROJECT_SOURCE_DIR@/idl \
 			 @PROJECT_SOURCE_DIR@/bin \
diff --git a/doc/salome/tui/input/index.doc b/doc/salome/tui/input/index.doc
index 42a4d8813..64de74049 100644
--- a/doc/salome/tui/input/index.doc
+++ b/doc/salome/tui/input/index.doc
@@ -4,7 +4,7 @@
 
 To browse the \b SALOME Geometry module Developer Documentation, follow the links below or use navigation menu at the top of the page:
 <ul>
-<li> <a href="modules.html">Modules</a> - documentation of TUI functionality.</li>
+<li> <a href="../../gui/GEOM/geompy_doc/modules.html">Modules</a> - documentation of TUI functionality.</li>
 <li> <a href="namespaces.html">Name Spaces</a> - list of TUI packages and scripts.</li>
 <li> <a href="hierarchy.html">Class hierarchy</a></li>
 <li> <a href="inherits.html">Graphical class hierarchy</a></li>

From 6f0f4ed5d1d983c228a7ccd5645ebab1d748320e Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 18 Nov 2019 14:12:24 +0300
Subject: [PATCH 3/3] #18319 [CEA 18318] Display of a field with negative value

---
 src/GEOMGUI/GEOM_Displayer.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index 050f2d968..545a2639f 100644
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -2900,7 +2900,10 @@ QList<QVariant> GEOM_Displayer::groupFieldData( const QList<QVariant>& theFieldS
             aValue = double( aVariant.toLongLong() );
           else if( aVariant.type() == QVariant::Double )
             aValue = aVariant.toDouble();
-          aNorm += aValue * aValue;
+          if ( theFieldNbComponents > 1 )
+            aNorm += aValue * aValue;
+          else
+            aNorm += aValue;
         }
       }
     }
@@ -2911,7 +2914,7 @@ QList<QVariant> GEOM_Displayer::groupFieldData( const QList<QVariant>& theFieldS
     {
       if( anIsBoolean )
         aNorm /= theFieldNbComponents;
-      else
+      else if ( theFieldNbComponents > 1 )
         aNorm = pow( aNorm, 0.5 );
 
       if( aGroupedList.isEmpty() )