From 695b8fc8234ca7f9b7496e71bd9ec19bc770daa7 Mon Sep 17 00:00:00 2001
From: mfeemster <matt.feemster@gmail.com>
Date: Mon, 29 Feb 2016 16:35:25 -0800
Subject: [PATCH] --Bug fixes  -Do not reset locked affine scale on new flame.

---
 Source/Fractorium/FractoriumEmberController.cpp | 1 -
 Source/Fractorium/FractoriumEmberController.h   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Fractorium/FractoriumEmberController.cpp b/Source/Fractorium/FractoriumEmberController.cpp
index c0ace11..4ec0dcd 100644
--- a/Source/Fractorium/FractoriumEmberController.cpp
+++ b/Source/Fractorium/FractoriumEmberController.cpp
@@ -352,7 +352,6 @@ void FractoriumEmberController<T>::SetEmberPrivate(const Ember<U>& ember, bool v
 	string filename = "last.flame";
 	writer.Save(filename.c_str(), m_Ember, 0, true, false, true);
 	m_GLController->ResetMouseState();
-	m_Fractorium->ui.LockAffineCheckBox->setChecked(false);
 	FillXforms();//Must do this first because the palette setup in FillParamTablesAndPalette() uses the xforms combo.
 	FillParamTablesAndPalette();
 	FillSummary();
diff --git a/Source/Fractorium/FractoriumEmberController.h b/Source/Fractorium/FractoriumEmberController.h
index 330218a..03d51ae 100644
--- a/Source/Fractorium/FractoriumEmberController.h
+++ b/Source/Fractorium/FractoriumEmberController.h
@@ -173,6 +173,7 @@ public:
 	virtual void ResetXformsAffine(bool pre) { }
 	virtual void FillBothAffines() { }
 	double LockedScale() { return m_LockedScale; }
+	void LockedScale(double scale) { m_LockedScale = scale; }
 	virtual void LockAffineScaleCheckBoxStateChanged(int state) { }
 
 	//Xforms Color.