projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the framerate from the root canvas, not the parent canvas.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_timestring.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_timestring.cpp
b/synfig-core/trunk/src/synfig/valuenode_timestring.cpp
index
628b504
..
d5f6435
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_timestring.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_timestring.cpp
@@
-91,8
+91,8
@@
ValueNode_TimeString::operator()(Time t)const
switch (get_type())
{
case ValueBase::TYPE_STRING:
switch (get_type())
{
case ValueBase::TYPE_STRING:
- if (get_
paren
t_canvas())
- return time.get_string(get_
paren
t_canvas()->rend_desc().get_frame_rate());
+ if (get_
roo
t_canvas())
+ return time.get_string(get_
roo
t_canvas()->rend_desc().get_frame_rate());
else
return time.get_string();
default:
else
return time.get_string();
default: