From 128b64d4dab55d9b4c0f02aff569f43e0d1d9fa0 Mon Sep 17 00:00:00 2001 From: Jeremy Bullock Date: Oct 28 2016 16:09:42 +0000 Subject: Merge pull request #879 from shun-iwasawa/save_fmtprops_to_prj Fix Save Default Settings command to save format properties to project settings --- diff --git a/toonz/sources/toonzlib/outputproperties.cpp b/toonz/sources/toonzlib/outputproperties.cpp index 3951752..0ea61b2 100644 --- a/toonz/sources/toonzlib/outputproperties.cpp +++ b/toonz/sources/toonzlib/outputproperties.cpp @@ -97,7 +97,7 @@ TOutputProperties &TOutputProperties::operator=(const TOutputProperties &src) { std::map::const_iterator sft, sfEnd = src.m_formatProperties.end(); - for (sft = src.m_formatProperties.end(); sft != sfEnd; ++sft) + for (sft = src.m_formatProperties.begin(); sft != sfEnd; ++sft) m_formatProperties[sft->first] = sft->second->clone(); return *this; diff --git a/toonz/sources/toonzlib/sceneproperties.cpp b/toonz/sources/toonzlib/sceneproperties.cpp index 154bfd5..76b6e25 100644 --- a/toonz/sources/toonzlib/sceneproperties.cpp +++ b/toonz/sources/toonzlib/sceneproperties.cpp @@ -80,8 +80,6 @@ void TSceneProperties::assign(const TSceneProperties *sprop) { for (int i = 0; i < (int)m_cameras.size(); i++) m_cameras[i] = new TCamera(*m_cameras[i]); } - *m_outputProp = *sprop->m_outputProp; - *m_previewProp = *sprop->m_previewProp; m_bgColor = sprop->m_bgColor; m_markerDistance = sprop->m_markerDistance; m_markerOffset = sprop->m_markerOffset;