X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.cpp;h=76438833ba73227cc120f8828a3b9560e0b8e34e;hb=47a979c060132d120dbc8160aa9ae2e8c9d900c0;hp=d38ee2cd866cf26c2cd716d1eea1b3ff4b0d45c6;hpb=f9b4e5524a9f481a890f9f60d5f9a414bde2211e;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index d38ee2c..7643883 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -276,8 +276,7 @@ void Layer::on_changed() { dirty_time_=Time::end(); - if(active()) - Node::on_changed(); + Node::on_changed(); } bool @@ -305,18 +304,20 @@ Layer::get_z_depth(const synfig::Time& t)const return (*dynamic_param_list().find("z_depth")->second)(t).get(Real()); } -#ifdef THIS_CODE_IS_NOT_USED -Layer* +Layer::Handle Layer::simple_clone()const { if(!book().count(get_name())) return 0; - Layer *ret = create(get_name()).get(); - ret->set_canvas(get_canvas()); + Handle ret = create(get_name()).get(); + ret->group_=group_; + //ret->set_canvas(get_canvas()); ret->set_description(get_description()); + ret->set_active(active()); ret->set_param_list(get_param_list()); + for(DynamicParamList::const_iterator iter=dynamic_param_list().begin();iter!=dynamic_param_list().end();++iter) + ret->connect_dynamic_param(iter->first, iter->second); return ret; } -#endif /* THIS_CODE_IS_NOT_USED */ Layer::Handle Layer::clone(const GUID& deriv_guid) const @@ -340,7 +341,6 @@ Layer::clone(const GUID& deriv_guid) const { if(dynamic_param_list().count(iter->first)==0 && iter->second.get_type()==ValueBase::TYPE_CANVAS) { - // This parameter is a canvas. We need a close look. Canvas::Handle canvas(iter->second.get(Canvas::Handle())); if(canvas && canvas->is_inline())