projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed some debugging code that I didn't mean to commit.
[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
3c9d834
..
dc95141
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/
synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@
-69,9
+69,9
@@
public:
/* === G L O B A L S ======================================================= */
SYNFIG_LAYER_INIT(Layer_PasteCanvas);
/* === G L O B A L S ======================================================= */
SYNFIG_LAYER_INIT(Layer_PasteCanvas);
-SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas");
+SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas");
// todo: use paste_canvas
SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas"));
SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("
Default
"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("
Other
"));
SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1");
SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$");
SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1");
SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$");
@@
-231,7
+231,7
@@
Layer_PasteCanvas::set_time(Context context, Time time)const
context.set_time(time);
if(canvas)
{
context.set_time(time);
if(canvas)
{
- canvas->set_time(time);
+ canvas->set_time(time
+time_offset
);
bounds=(canvas->get_context().get_full_bounding_rect()-canvas->rend_desc().get_focus())*exp(zoom)+origin+canvas->rend_desc().get_focus();
}
bounds=(canvas->get_context().get_full_bounding_rect()-canvas->rend_desc().get_focus())*exp(zoom)+origin+canvas->rend_desc().get_focus();
}