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

Merged mfeemster/fractorium into master

Browse Source
This commit is contained in:
Michel Mastriani 2019-05-21 13:20:06 -03:00
commit f29dda2ec0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Fractorium/FractoriumLibrary.cpp
View File

@ -148,6 +148,9 @@ void FractoriumEmberController<T>::SyncLibrary(eLibraryUpdate update)
if (update & eLibraryUpdate::POINTER) if (update & eLibraryUpdate::POINTER)
item->SetEmberPointer(&(*it)); item->SetEmberPointer(&(*it));
if (item->checkState(0) == Qt::Checked)
m_EmberFilePointer = item->GetEmber();
} }
} }
} }

2
Source/Fractorium/FractoriumRender.cpp
View File

@ -724,6 +724,7 @@ bool Fractorium::CreateControllerFromOptions()
auto con = m_PaletteContrastSpin->value(); auto con = m_PaletteContrastSpin->value();
auto blur = m_PaletteBlurSpin->value(); auto blur = m_PaletteBlurSpin->value();
auto freq = m_PaletteFrequencySpin->value(); auto freq = m_PaletteFrequencySpin->value();
auto rot = m_PreviewPaletteRotation;
double scale; double scale;
uint current = 0; uint current = 0;
#ifdef DO_DOUBLE #ifdef DO_DOUBLE
@ -784,6 +785,7 @@ bool Fractorium::CreateControllerFromOptions()
m_PaletteContrastSpin->SetValueStealth(con); m_PaletteContrastSpin->SetValueStealth(con);
m_PaletteBlurSpin->SetValueStealth(blur); m_PaletteBlurSpin->SetValueStealth(blur);
m_PaletteFrequencySpin->SetValueStealth(freq); 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. m_Controller->PaletteAdjust();//Applies the adjustments to temp and saves in m_Ember.m_Palette, then fills in the palette preview widget.
} }