mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 05:00:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--User changes

Browse Source 
-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.
This commit is contained in:
Person 2024-01-30 12:36:00 -07:00
parent 7929e0ef05
commit a8fc7caa9f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Fractorium/FinalRenderDialog.cpp
View File

@ -974,7 +974,7 @@ void FractoriumFinalRenderDialog::showEvent(QShowEvent* e)
if (m_FromSequence) if (m_FromSequence)
{ {
ui.FinalRenderDoAllCheckBox->setChecked(true); ui.FinalRenderDoAllCheckBox->setChecked(true);
ui.FinalRenderDoSequenceCheckBox->setChecked(true); //ui.FinalRenderDoSequenceCheckBox->setChecked(true);
ui.FinalRenderApplyToAllCheckBox->setChecked(true); ui.FinalRenderApplyToAllCheckBox->setChecked(true);
m_PrefixEdit->setText(firstfile + "_"); m_PrefixEdit->setText(firstfile + "_");
} }

5
Source/Fractorium/FinalRenderEmberController.cpp
View File

@ -268,7 +268,8 @@ FinalRenderEmberController<T>::FinalRenderEmberController(FractoriumFinalRenderD
//The rendering process is different between doing a single image, and doing multiple. //The rendering process is different between doing a single image, and doing multiple.
if (doAll) if (doAll)
{ {
m_ImageCount = m_EmberFile.Size(); auto i = m_GuiState.m_StartAt;
m_ImageCount = m_EmberFile.Size() - i;
ostringstream os; ostringstream os;
const auto padding = streamsize(std::log10(m_EmberFile.Size())) + 1; const auto padding = streamsize(std::log10(m_EmberFile.Size())) + 1;
os << setfill('0') << setprecision(0) << fixed; os << setfill('0') << setprecision(0) << fixed;
@ -335,8 +336,6 @@ FinalRenderEmberController<T>::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). 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. //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)) while (auto ember = m_EmberFile.Get(i))
{ {
if (!m_Run) if (!m_Run)