Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-07-09 23:49:31 +02:00
49 changed files with 418 additions and 419 deletions

View File

@@ -626,10 +626,10 @@ bool MyFlatCurve::handleEvents (GdkEvent* event)
itrt = curve.rightTangent.begin();
for (int i = 0; i < closest_point; i++) {
itx++;
ity++;
itlt++;
itrt++;
++itx;
++ity;
++itlt;
++itrt;
}
curve.x.insert (itx, 0);
@@ -1312,10 +1312,10 @@ bool MyFlatCurve::pipetteButton1Pressed(EditDataProvider *provider, int modifier
itrt = curve.rightTangent.begin();
for (int i = 0; i < closest_point; i++) {
itx++;
ity++;
itlt++;
itrt++;
++itx;
++ity;
++itlt;
++itrt;
}
curve.x.insert (itx, 0);