Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/coordinateadjuster.cc
+++ b/rtgui/coordinateadjuster.cc
@@ -122,9 +122,8 @@ void CoordinateAdjuster::createWidgets(const std::vector<Axis> &axis)

    axisAdjusters.resize(axis.size());

-    AxisAdjuster *currAdjuster = NULL;
-
    for (unsigned int i = 0; i < count; ++i) {
+        AxisAdjuster *currAdjuster = NULL;
        const Axis *currAxis = &(axis.at(i));
        axisAdjusters.at(i) = new AxisAdjuster(this, currAxis, i);
        currAdjuster = axisAdjusters.at(i);