Merge branch 'master' into force-critical-input-trickle
This commit is contained in:
commit
bbeb3df9f6
189 changed files with 7585 additions and 3187 deletions
|
|
@ -420,9 +420,6 @@ void FurnaceGUI::drawPattern() {
|
|||
//char id[32];
|
||||
ImGui::PushFont(patFont);
|
||||
int ord=oldOrder;
|
||||
if (followPattern) {
|
||||
curOrder=e->getOrder();
|
||||
}
|
||||
oldOrder=curOrder;
|
||||
int chans=e->getTotalChannelCount();
|
||||
int displayChans=0;
|
||||
|
|
@ -829,8 +826,6 @@ void FurnaceGUI::drawPattern() {
|
|||
ImGui::GetColorU32(chanHeadBase)
|
||||
);
|
||||
}
|
||||
keyHit1[i]-=0.2f;
|
||||
if (keyHit1[i]<0.0f) keyHit1[i]=0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue