X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=7d8fbea22eb25d9f64760d59251a18e6e9bed772;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=4095de7c5c936d839701b1bfec0fa50bb394bc1e;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index 4095de7..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$ ** @@ -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);