Merge branch 'master' into es5506_alt
This commit is contained in:
commit
b42d5b7c1b
11 changed files with 266 additions and 201 deletions
|
|
@ -77,6 +77,9 @@ void FurnaceGUI::drawSampleEdit() {
|
|||
if (sampleDepths[i]==NULL) continue;
|
||||
if (ImGui::Selectable(sampleDepths[i])) {
|
||||
sample->prepareUndo(true);
|
||||
e->lockEngine([sample]() {
|
||||
sample->render();
|
||||
});
|
||||
sample->depth=(DivSampleDepth)i;
|
||||
e->renderSamplesP();
|
||||
updateSampleTex=true;
|
||||
|
|
@ -633,6 +636,9 @@ void FurnaceGUI::drawSampleEdit() {
|
|||
if (sampleDepths[i]==NULL) continue;
|
||||
if (ImGui::Selectable(sampleDepths[i])) {
|
||||
sample->prepareUndo(true);
|
||||
e->lockEngine([sample]() {
|
||||
sample->render();
|
||||
});
|
||||
sample->depth=(DivSampleDepth)i;
|
||||
e->renderSamplesP();
|
||||
updateSampleTex=true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue