merge with dev - all warnings are not delete - come soon

2017-04-08 19:28:04 +02:00
parent 6608d5147c 73e14702dd
commit 398e862b2b
144 changed files with 5970 additions and 5235 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1323,8 +1323,8 @@ public:
        double pixelShiftSigma;
        double pixelShiftSum;
        double pixelShiftRedBlueWeight;
-        bool pixelshiftShowMotion;
-        bool pixelshiftShowMotionMaskOnly;
+        bool pixelShiftShowMotion;
+        bool pixelShiftShowMotionMaskOnly;
        bool pixelShiftAutomatic;
        bool pixelShiftNonGreenHorizontal;
        bool pixelShiftNonGreenVertical;