Merge remote-tracking branch 'origin/RB-2.3'

App/App.pro

@@ -21,7 +21,7 @@ TARGET = Natron
 # the list of currently maintained versions (those that have to be merged into the master branch)
 VERSION_21 = 2.1.10
 VERSION_22 = 2.2.10
-VERSION_23 = 2.3.0
+VERSION_23 = 2.3.2
 VERSION_30 = 3.0.0
 
 # The version for this branch

CHANGELOG.md

@@ -33,11 +33,17 @@ Natron multiple times on the same computer, the different processes will share t
 - For convenience, a PyPlug may specify a list of the nodes inside its node graph that should have their viewer overlay displayed when the PyPlug setting panel is opened. For instance, imagine that the PyPlug uses a Transform node internally, it is possible to display the Transform node handle on the viewer when the PyPlug settings panel is opened, even if the Transform node panel itself is closed
 
 
+## Version 2.3.2
+
+- Merge: fix bug #1648, where the alpha from the B input would be used for all consecutive merge operations, rather than updated at each operation.
+
+
 ## Version 2.3.1
 
 - Python: Fix the setTable() function of the PathParam class
 - Windows: Fix a bug where most image formats would not read and write correctly
 
+
 ## Version 2.3.0
 
 - Fix lots of bugs when loading older Natron project files.

Documentation/source/conf.py

@@ -51,7 +51,7 @@
 # the list of currently maintained versions (those that have to be merged into the master branch)
 version_21 = '2.1.10'
 version_22 = '2.2.10'
-version_23 = '2.3.0'
+version_23 = '2.3.2'
 version_30 = '3.0.0'
 
 # The version for this branch

Documentation/source/devel/conf.py

@@ -57,7 +57,7 @@
 # the list of currently maintained versions (those that have to be merged into the master branch)
 version_21 = '2.1.10'
 version_22 = '2.2.10'
-version_23 = '2.3.0'
+version_23 = '2.3.2'
 version_30 = '3.0.0'
 
 # The version for this branch

Documentation/source/guide/conf.py

@@ -51,7 +51,7 @@
 # the list of currently maintained versions (those that have to be merged into the master branch)
 version_21 = '2.1.10'
 version_22 = '2.2.10'
-version_23 = '2.3.0'
+version_23 = '2.3.2'
 version_30 = '3.0.0'
 
 # The version for this branch

Engine/Project.cpp

@@ -2145,20 +2145,34 @@ Project::unlock() const
 }
 
 
+inline ViewerColorSpaceEnum colorspaceParamIndexToEnum(int index)
+{
+    switch (index) {
+        case 0:
+            return eViewerColorSpaceLinear;
+        case 1:
+            return eViewerColorSpaceSRGB;
+        case 2:
+            return eViewerColorSpaceRec709;
+        default:
+            return eViewerColorSpaceLinear;
+    }
+}
+
 ViewerColorSpaceEnum
 Project::getDefaultColorSpaceForBitDepth(ImageBitDepthEnum bitdepth) const
 {
     switch (bitdepth) {
     case eImageBitDepthByte:
 
-        return (ViewerColorSpaceEnum)_imp->colorSpace8u->getValue();
+        return colorspaceParamIndexToEnum(_imp->colorSpace8u->getValue());
     case eImageBitDepthShort:
 
-        return (ViewerColorSpaceEnum)_imp->colorSpace16u->getValue();
+        return colorspaceParamIndexToEnum(_imp->colorSpace16u->getValue());
     case eImageBitDepthHalf: // same colorspace as float
     case eImageBitDepthFloat:
 
-        return (ViewerColorSpaceEnum)_imp->colorSpace32f->getValue();
+        return colorspaceParamIndexToEnum(_imp->colorSpace32f->getValue());
     case eImageBitDepthNone:
         assert(false);
         break;

Global/Macros.h

@@ -138,10 +138,10 @@ namespace NATRON_PYTHON_NAMESPACE { }
 #define NATRON_VERSION_MINOR_30 0
 #define NATRON_VERSION_REVISION_30 0
 
-// RB-2: 2.3.0
+// RB-2: 2.3.2
 #define NATRON_VERSION_MAJOR_23 2
 #define NATRON_VERSION_MINOR_23 3
-#define NATRON_VERSION_REVISION_23 0
+#define NATRON_VERSION_REVISION_23 2
 
 // RB-2.2: 2.2.10
 #define NATRON_VERSION_MAJOR_22 2

Natron.spec

@@ -3,7 +3,7 @@ Name: Natron
 # The two actively maintained versions (that are merged into master)
 Version21: 2.1.10
 Version22: 2.2.10
-Version23: 2.3.0
+Version23: 2.3.2
 Version30: 3.0.0
 
 # The version for this branch of the sources