projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'genete_static_values'
[synfig.git]
/
synfig-core
/
src
/
modules
/
lyr_std
/
import.cpp
diff --git
a/synfig-core/src/modules/lyr_std/import.cpp
b/synfig-core/src/modules/lyr_std/import.cpp
index
d393f59
..
d37eecf
100644
(file)
--- a/
synfig-core/src/modules/lyr_std/import.cpp
+++ b/
synfig-core/src/modules/lyr_std/import.cpp
@@
-165,7
+165,7
@@
Import::set_param(const String & param, const ValueBase &value)
}
surface.clear();
}
surface.clear();
- if(!newimporter->get_frame(surface,Time(0),trimmed,width,height,top,left))
+ if(!newimporter->get_frame(surface,
get_canvas()->rend_desc(),
Time(0),trimmed,width,height,top,left))
{
synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
}
{
synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
}
@@
-228,7
+228,7
@@
Import::set_time(Context context, Time time)const
{
if(get_amount() && importer &&
importer->is_animated())
{
if(get_amount() && importer &&
importer->is_animated())
- importer->get_frame(surface,time+time_offset,trimmed,width,height,top,left);
+ importer->get_frame(surface,
get_canvas()->rend_desc(),
time+time_offset,trimmed,width,height,top,left);
context.set_time(time);
}
context.set_time(time);
}
@@
-238,7
+238,7
@@
Import::set_time(Context context, Time time, const Point &pos)const
{
if(get_amount() && importer &&
importer->is_animated())
{
if(get_amount() && importer &&
importer->is_animated())
- importer->get_frame(surface,time+time_offset,trimmed,width,height,top,left);
+ importer->get_frame(surface,
get_canvas()->rend_desc(),
time+time_offset,trimmed,width,height,top,left);
context.set_time(time,pos);
}
context.set_time(time,pos);
}