From 18ffae0cec5f9bf4792c5daa7dc36bfb0425650a Mon Sep 17 00:00:00 2001 From: dooglus Date: Tue, 18 Dec 2007 12:40:58 +0000 Subject: [PATCH] Fix 1844764 by reverting r954. Added a 'todo', because maybe r954 was doing something useful, but I can't see it at the moment. git-svn-id: http://svn.voria.com/code@1216 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/layer_pastecanvas.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index 203c367..cf2ae81 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -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); -- 2.7.4