merge with dev...

2017-06-19 12:30:20 +02:00
parent f1a90dad54 a9f769c5d7
commit acd715dd44
90 changed files with 598 additions and 866 deletions
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -5476,7 +5476,6 @@ SSEFUNCTION void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBu
        editID = pipetteBuffer->getEditID();

        if (editID != EUID_None) {
-            editPipette = true;

            switch  (pipetteBuffer->getDataProvider()->getCurrSubscriber()->getPipetteBufferType()) {
                case (BT_IMAGEFLOAT):
@@ -5486,6 +5485,7 @@ SSEFUNCTION void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBu
                    break;

                case (BT_SINGLEPLANE_FLOAT):
+                    editPipette = true;
                    editWhatever = pipetteBuffer->getSinglePlaneBuffer();
                    break;
            }