Merge branch 'dev' into testoutputprofile

rtgui/paramsedited.h

@@ -571,6 +571,7 @@ public:
     bool width;
     bool height;
     bool enabled;
+    bool allowUpscaling;
 };
 
 class ColorManagementParamsEdited
@@ -715,6 +716,13 @@ public:
     bool strength;
 };
 
+class SoftLightParamsEdited
+{
+public:
+    bool enabled;
+    bool strength;
+};
+
 class RAWParamsEdited
 {
 
@@ -724,6 +732,7 @@ public:
 
     public:
         bool method;
+        bool border;
         bool imageNum;
         bool ccSteps;
         bool exBlack0;
@@ -852,6 +861,7 @@ public:
     WaveletParamsEdited             wavelet;
     HSVEqualizerParamsEdited      hsvequalizer;
     FilmSimulationParamsEdited    filmSimulation;
+    SoftLightParamsEdited         softlight;
     MetaDataParamsEdited          metadata;
     bool                          exif;
     bool                          iptc;