diff --git a/Source/Fractorium/FractoriumEmberController.h b/Source/Fractorium/FractoriumEmberController.h index 72665a1..47d70fa 100644 --- a/Source/Fractorium/FractoriumEmberController.h +++ b/Source/Fractorium/FractoriumEmberController.h @@ -489,7 +489,7 @@ public: void FillWithXform(Xform* xform); Xform* CurrentXform(); void UpdateXform(std::function*, size_t, size_t)> func, eXformUpdate updateType = eXformUpdate::UPDATE_CURRENT, bool updateRender = true, eProcessAction action = eProcessAction::FULL_RENDER, size_t index = 0); - static void AddXformsWithXaos(Ember& ember, std::vector, size_t>>& xforms, bool preserveXaos, eXaosPasteStyle pastestyle); + static void AddXformsWithXaos(Ember& ember, std::vector, size_t>>& xforms, eXaosPasteStyle pastestyle); //Xforms Affine. virtual void AffineSetHelper(double d, int index, bool pre) override; diff --git a/Source/Fractorium/FractoriumMenus.cpp b/Source/Fractorium/FractoriumMenus.cpp index 1388eee..bdc15fd 100644 --- a/Source/Fractorium/FractoriumMenus.cpp +++ b/Source/Fractorium/FractoriumMenus.cpp @@ -812,7 +812,7 @@ void FractoriumEmberController::PasteSelectedXforms() { Update([&]() { - AddXformsWithXaos(m_Ember, m_CopiedXforms, true, m_Fractorium->GetXaosPasteStyleType()); + AddXformsWithXaos(m_Ember, m_CopiedXforms, m_Fractorium->GetXaosPasteStyleType()); if (!m_CopiedFinalXform.Empty()) m_Ember.SetFinalXform(m_CopiedFinalXform); diff --git a/Source/Fractorium/FractoriumXaos.cpp b/Source/Fractorium/FractoriumXaos.cpp index 49d48ab..d5795c0 100644 --- a/Source/Fractorium/FractoriumXaos.cpp +++ b/Source/Fractorium/FractoriumXaos.cpp @@ -265,7 +265,7 @@ void FractoriumEmberController::AddLayer(int xforms) Update([&] { std::vector, size_t>> vec(xforms); - AddXformsWithXaos(m_Ember, vec, false, eXaosPasteStyle::ZERO_TO_ONE); + AddXformsWithXaos(m_Ember, vec, eXaosPasteStyle::ZERO_TO_ONE); }); FillXforms(); diff --git a/Source/Fractorium/FractoriumXforms.cpp b/Source/Fractorium/FractoriumXforms.cpp index e68f45d..7c53f49 100644 --- a/Source/Fractorium/FractoriumXforms.cpp +++ b/Source/Fractorium/FractoriumXforms.cpp @@ -211,10 +211,9 @@ void Fractorium::OnAddLinkedXformButtonClicked(bool checked) { m_Controller->Add /// /// The ember to add xforms to /// The vector of xforms to add -/// True to preserve xaos else false. /// The method which governs how the copying of xaos values is handles template -void FractoriumEmberController::AddXformsWithXaos(Ember& ember, std::vector, size_t>>& xforms, bool preserveXaos, eXaosPasteStyle pastestyle) +void FractoriumEmberController::AddXformsWithXaos(Ember& ember, std::vector, size_t>>& xforms, eXaosPasteStyle pastestyle) { auto oldxfcount = ember.XformCount(); @@ -309,7 +308,7 @@ void FractoriumEmberController::DuplicateXform() }, eXformUpdate::UPDATE_SELECTED_EXCEPT_FINAL, false); Update([&]() { - AddXformsWithXaos(m_Ember, vec, true, m_Fractorium->GetXaosPasteStyleType()); + AddXformsWithXaos(m_Ember, vec, m_Fractorium->GetXaosPasteStyleType()); int index = int(m_Ember.TotalXformCount(forceFinal) - (forceFinal ? 2 : 1));//Set index to the last item before final. FillXforms(index);//Handles xaos. });