projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1862720: "libltdl library and headers out of sync" - applied patch by Daniel...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_pastecanvas.cpp
diff --git
a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index
4095de7
..
cf2ae81
100644
(file)
--- 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
/* === S Y N F I G ========================================================= */
/*! \file layer_pastecanvas.cpp
-** \brief
Template Head
er
+** \brief
Implementation of the "Paste Canvas" lay
er
**
** $Id$
**
**
** $Id$
**
@@
-154,7
+154,8
@@
Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
return true;
}
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()))
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;
}
}
return true;
}
+#else
+ IMPORT(time_offset);
+#endif
IMPORT(children_lock);
IMPORT(zoom);
IMPORT(children_lock);
IMPORT(zoom);