Merge branch 'master' into es5506_alt
This commit is contained in:
commit
a793bed56d
65 changed files with 4981 additions and 395 deletions
|
|
@ -227,11 +227,11 @@ void FurnaceGUI::drawSampleEdit() {
|
|||
if (sampleDepths[i]==NULL) continue;
|
||||
if (ImGui::Selectable(sampleDepths[i])) {
|
||||
sample->prepareUndo(true);
|
||||
e->lockEngine([sample]() {
|
||||
e->lockEngine([this,sample,i]() {
|
||||
sample->render();
|
||||
sample->depth=(DivSampleDepth)i;
|
||||
e->renderSamples();
|
||||
});
|
||||
sample->depth=(DivSampleDepth)i;
|
||||
e->renderSamplesP();
|
||||
updateSampleTex=true;
|
||||
MARK_MODIFIED;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue