Merge with dev

2020-05-13 08:51:50 +02:00
parent b73e9f1e3e 85cb2086dc
commit a806d00268
16 changed files with 1003 additions and 520 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -141,6 +141,7 @@ protected:
    WavCurve wavCLVCurve;
    Wavblcurve wavblcurve;
    WavOpacityCurveRG waOpacityCurveRG;
+    WavOpacityCurveSH waOpacityCurveSH;
    WavOpacityCurveBY waOpacityCurveBY;
    WavOpacityCurveW waOpacityCurveW;
    WavOpacityCurveWL waOpacityCurveWL;