From 142b5975654d85fa9ee17f0df898fcda7f726dae Mon Sep 17 00:00:00 2001 From: Person Date: Mon, 20 May 2019 15:44:46 -0700 Subject: [PATCH 1/2] --Bug fixes -Switching between SP/DP was resetting palette rotation. --- Source/Fractorium/FractoriumRender.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Fractorium/FractoriumRender.cpp b/Source/Fractorium/FractoriumRender.cpp index 09f2f52..e351b79 100644 --- a/Source/Fractorium/FractoriumRender.cpp +++ b/Source/Fractorium/FractoriumRender.cpp @@ -724,6 +724,7 @@ bool Fractorium::CreateControllerFromOptions() auto con = m_PaletteContrastSpin->value(); auto blur = m_PaletteBlurSpin->value(); auto freq = m_PaletteFrequencySpin->value(); + auto rot = m_PreviewPaletteRotation; double scale; uint current = 0; #ifdef DO_DOUBLE @@ -784,6 +785,7 @@ bool Fractorium::CreateControllerFromOptions() m_PaletteContrastSpin->SetValueStealth(con); m_PaletteBlurSpin->SetValueStealth(blur); m_PaletteFrequencySpin->SetValueStealth(freq); + m_PreviewPaletteRotation = rot; m_Controller->PaletteAdjust();//Applies the adjustments to temp and saves in m_Ember.m_Palette, then fills in the palette preview widget. } From 243be8d702ace0718f2aaa72ac47acc90e36b2cb Mon Sep 17 00:00:00 2001 From: Person Date: Mon, 20 May 2019 18:24:32 -0700 Subject: [PATCH 2/2] --Bug fixes -Dragging library items to a new position was not properly resetting the current flame pointer, so subsequent edits would unintentionally overwrite different flames. --- Source/Fractorium/FractoriumLibrary.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Fractorium/FractoriumLibrary.cpp b/Source/Fractorium/FractoriumLibrary.cpp index a1c9b73..e757dfc 100644 --- a/Source/Fractorium/FractoriumLibrary.cpp +++ b/Source/Fractorium/FractoriumLibrary.cpp @@ -148,6 +148,9 @@ void FractoriumEmberController::SyncLibrary(eLibraryUpdate update) if (update & eLibraryUpdate::POINTER) item->SetEmberPointer(&(*it)); + + if (item->checkState(0) == Qt::Checked) + m_EmberFilePointer = item->GetEmber(); } } }