--Bug fixes

-Do not reset locked affine scale on new flame.
This commit is contained in:
mfeemster 2016-02-29 16:35:25 -08:00
parent 63f933de0e
commit 695b8fc823
2 changed files with 1 additions and 1 deletions

View File

@ -352,7 +352,6 @@ void FractoriumEmberController<T>::SetEmberPrivate(const Ember<U>& ember, bool v
string filename = "last.flame"; string filename = "last.flame";
writer.Save(filename.c_str(), m_Ember, 0, true, false, true); writer.Save(filename.c_str(), m_Ember, 0, true, false, true);
m_GLController->ResetMouseState(); m_GLController->ResetMouseState();
m_Fractorium->ui.LockAffineCheckBox->setChecked(false);
FillXforms();//Must do this first because the palette setup in FillParamTablesAndPalette() uses the xforms combo. FillXforms();//Must do this first because the palette setup in FillParamTablesAndPalette() uses the xforms combo.
FillParamTablesAndPalette(); FillParamTablesAndPalette();
FillSummary(); FillSummary();

View File

@ -173,6 +173,7 @@ public:
virtual void ResetXformsAffine(bool pre) { } virtual void ResetXformsAffine(bool pre) { }
virtual void FillBothAffines() { } virtual void FillBothAffines() { }
double LockedScale() { return m_LockedScale; } double LockedScale() { return m_LockedScale; }
void LockedScale(double scale) { m_LockedScale = scale; }
virtual void LockAffineScaleCheckBoxStateChanged(int state) { } virtual void LockAffineScaleCheckBoxStateChanged(int state) { }
//Xforms Color. //Xforms Color.