projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use filename_extension() and filename_sans_extension().
[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
2dd4eb0
..
026a113
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/
synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-231,7
+232,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();
}
@@
-358,7
+359,9
@@
Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
Surface pastesurface;
Surface pastesurface;
- if(area.area()<=0.000001 || desc.get_w()==0 || desc.get_h()==0)
+ // \todo this used to also have "area.area()<=0.000001 || " - is it useful?
+ // it was causing bug #1809480 (Zoom in beyond 8.75 in nested canvases fails)
+ if(desc.get_w()==0 || desc.get_h()==0)
{
if(cb && !cb->amount_complete(10000,10000)) return false;
{
if(cb && !cb->amount_complete(10000,10000)) return false;