X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.cpp;h=9a5bf2c999d7a30a31611696917909275e8ec411;hb=f0822259537b982aa9f93caa55fbb91feb09dd8b;hp=9edaffe906645f931322f4e285a0f1c07b0bf415;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index 9edaffe..9a5bf2c 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -97,8 +97,23 @@ Layer::subsys_init() { _layer_book=new Book(); -#define INCLUDE_LAYER(class) synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,dgettext("synfig",class::local_name__),dgettext("synfig",class::category__),class::cvs_id__,class::version__) -#define LAYER_ALIAS(class,alias) synfig::Layer::book()[synfig::String(alias)]=synfig::Layer::BookEntry(class::create,alias,alias,CATEGORY_DO_NOT_USE,class::cvs_id__,class::version__); +#define INCLUDE_LAYER(class) \ + synfig::Layer::book() [synfig::String(class::name__)] = \ + BookEntry(class::create, \ + class::name__, \ + dgettext("synfig", class::local_name__), \ + class::category__, \ + class::cvs_id__, \ + class::version__) + +#define LAYER_ALIAS(class,alias) \ + synfig::Layer::book()[synfig::String(alias)] = \ + BookEntry(class::create, \ + alias, \ + alias, \ + CATEGORY_DO_NOT_USE, \ + class::cvs_id__, \ + class::version__) INCLUDE_LAYER(Layer_SolidColor); LAYER_ALIAS(Layer_SolidColor, "solid_color"); INCLUDE_LAYER(Layer_PasteCanvas); LAYER_ALIAS(Layer_PasteCanvas, "paste_canvas"); @@ -261,8 +276,7 @@ void Layer::on_changed() { dirty_time_=Time::end(); - if(active()) - Node::on_changed(); + Node::on_changed(); } bool @@ -325,7 +339,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())