merge with dev..

2017-04-15 08:05:23 +02:00
parent ff35331249 59b62d90a1
commit b7183a63cc
11 changed files with 370 additions and 270 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -795,6 +795,7 @@ public:
        bool pixelShiftExp0;
        bool pixelShiftLmmse;
        bool pixelShiftEqualBright;
+        bool pixelShiftEqualBrightChannel;
        bool pixelShiftNonGreenCross;
        bool pixelShiftNonGreenCross2;
        bool pixelShiftNonGreenAmaze;