X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=7d8fbea22eb25d9f64760d59251a18e6e9bed772;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;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..7d8fbea 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); @@ -293,7 +297,6 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali if(depth==MAX_DEPTH) { - DEBUGPOINT(); // if we are at the extent of our depth, // then we should just return whatever is under us. return context.accelerated_render(surface,quality,renddesc,cb);