From c17d4c7869b85150034b081e8b9b79bc0583dcfb Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 29 Aug 2017 13:29:25 +0100 Subject: [PATCH] Fix texture saving not propagating the right settings --- qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp | 9 +++++++++ qrenderdoc/Windows/TextureViewer.cpp | 1 + 2 files changed, 10 insertions(+) diff --git a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp index f95265e83..716abb84d 100644 --- a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp @@ -77,11 +77,17 @@ TextureSaveDialog::TextureSaveDialog(const TextureDescription &t, const TextureS ui->mipSelect->addItem( QFormatStr("%1 - %2x%3").arg(i).arg(qMax(1U, tex.width >> i)).arg(qMax(1U, tex.height >> i))); + // reset as it might have been changed by adding items + saveData.mip = s.mip; + ui->mipSelect->setCurrentIndex(saveData.mip >= 0 ? saveData.mip : 0); for(uint32_t i = 0; i < tex.msSamp; i++) ui->sampleSelect->addItem(tr("Sample %1").arg(i)); + // reset as it might have been changed by adding items + saveData.sample = s.sample; + ui->sampleSelect->setCurrentIndex(qMin( (int)tex.msSamp, (saveData.sample.sampleIndex == ~0U ? 0 : (int)saveData.sample.sampleIndex))); @@ -114,6 +120,9 @@ TextureSaveDialog::TextureSaveDialog(const TextureDescription &t, const TextureS } } + // reset as it might have been changed by adding items + saveData.slice = s.slice; + ui->sliceSelect->setCurrentIndex(saveData.slice.sliceIndex >= 0 ? saveData.slice.sliceIndex : 0); ui->gridWidth->setMaximum(tex.depth * tex.arraysize * tex.msSamp); diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index fa047f290..e7fe25b57 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -3337,6 +3337,7 @@ void TextureViewer::on_saveTex_clicked() TextureSave config; memset(&config, 0, sizeof(config)); + config.jpegQuality = 90; config.id = m_TexDisplay.texid; config.typeHint = m_TexDisplay.typeHint;