From a8fc7caa9f0d1407a985a6656da2f3d4ea62edce Mon Sep 17 00:00:00 2001 From: Person Date: Tue, 30 Jan 2024 12:36:00 -0700 Subject: [PATCH] --User changes -No longer automatically set sequence checkbox in the final render dialog when rendering a sequence. It's an outdated option for today's hardware. --Bug fixes -Properly count the number of images in the final render dialog when starting from a non-zero offset. --- Source/Fractorium/FinalRenderDialog.cpp | 2 +- Source/Fractorium/FinalRenderEmberController.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Fractorium/FinalRenderDialog.cpp b/Source/Fractorium/FinalRenderDialog.cpp index 7c445d6..6948fc2 100644 --- a/Source/Fractorium/FinalRenderDialog.cpp +++ b/Source/Fractorium/FinalRenderDialog.cpp @@ -974,7 +974,7 @@ void FractoriumFinalRenderDialog::showEvent(QShowEvent* e) if (m_FromSequence) { ui.FinalRenderDoAllCheckBox->setChecked(true); - ui.FinalRenderDoSequenceCheckBox->setChecked(true); + //ui.FinalRenderDoSequenceCheckBox->setChecked(true); ui.FinalRenderApplyToAllCheckBox->setChecked(true); m_PrefixEdit->setText(firstfile + "_"); } diff --git a/Source/Fractorium/FinalRenderEmberController.cpp b/Source/Fractorium/FinalRenderEmberController.cpp index 57e1265..158de3b 100644 --- a/Source/Fractorium/FinalRenderEmberController.cpp +++ b/Source/Fractorium/FinalRenderEmberController.cpp @@ -268,7 +268,8 @@ FinalRenderEmberController::FinalRenderEmberController(FractoriumFinalRenderD //The rendering process is different between doing a single image, and doing multiple. if (doAll) { - m_ImageCount = m_EmberFile.Size(); + auto i = m_GuiState.m_StartAt; + m_ImageCount = m_EmberFile.Size() - i; ostringstream os; const auto padding = streamsize(std::log10(m_EmberFile.Size())) + 1; os << setfill('0') << setprecision(0) << fixed; @@ -335,8 +336,6 @@ FinalRenderEmberController::FinalRenderEmberController(FractoriumFinalRenderD else if (m_Renderer.get())//Make sure a renderer was created and render all images, but not as an animation sequence (without temporal samples motion blur). { //Render each image, cancelling if m_Run ever gets set to false. - auto i = m_GuiState.m_StartAt; - while (auto ember = m_EmberFile.Get(i)) { if (!m_Run)