merge with dev

This commit is contained in:
Desmis
2019-03-25 11:19:06 +01:00
68 changed files with 3707 additions and 826 deletions

View File

@@ -1224,9 +1224,9 @@ void MyFlatCurve::pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider,
return;
}
pipetteR = provider->pipetteVal[0];
pipetteG = provider->pipetteVal[1];
pipetteB = provider->pipetteVal[2];
pipetteR = provider->getPipetteVal1();
pipetteG = provider->getPipetteVal2();
pipetteB = provider->getPipetteVal3();
pipetteVal = 0.f;
if (listener) {