Merge branch '2.3' into 3djc/fix-trims2subtrims

2020-11-26 21:04:39 +01:00
parent c071566aac 2319183b42
commit 55798d4711
12 changed files with 54 additions and 28 deletions
@@ -1837,6 +1837,7 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim
    if (g_model.limitData[i].revert)
      diff = -diff;
    v += (diff * 125) / 128;
+
    g_model.limitData[i].offset = limit((int16_t)-1000, (int16_t)v, (int16_t)1000); // make sure the offset doesn't go haywire
  }