X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=cf2ae81501d883e3e5c673f52641283f3c1036da;hb=36b62b6ea64fe871356d77e7aac1f53b9b33cebb;hp=89b3f284c259d0fae462733abf7155c72a3284ec;hpb=0590e8116853b768e027f0ead843e01696458dfc;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index 89b3f28..cf2ae81 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -1,6 +1,6 @@ /* === S Y N F I G ========================================================= */ /*! \file layer_pastecanvas.cpp -** \brief Template Header +** \brief Implementation of the "Paste Canvas" layer ** ** $Id$ ** @@ -71,8 +71,8 @@ public: SYNFIG_LAYER_INIT(Layer_PasteCanvas); SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); // todo: use paste_canvas -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas")); -SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,N_("Paste Canvas")); +SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,N_("Other")); SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$"); @@ -154,7 +154,8 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value) return true; } - // IMPORT(time_offset); + //! \todo this introduces bug 1844764 if enabled; it was introduced in r954, but I can't see if it's useful +#if 0 if (param=="time_offset" && value.same_type_as(time_offset)) { if (time_offset != value.get(Time())) @@ -166,6 +167,9 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value) } return true; } +#else + IMPORT(time_offset); +#endif IMPORT(children_lock); IMPORT(zoom);