projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the order of the modules - magick++ is the last resort, other than the custom...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_duplicate.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
b/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
index
2af20e7
..
5bb65f1
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
@@
-158,6
+158,7
@@
ValueNode_Duplicate::step(Time t)const
Real from = (*from_)(t).get(Real());
Real to = (*to_ )(t).get(Real());
Real step = (*step_)(t).get(Real());
Real from = (*from_)(t).get(Real());
Real to = (*to_ )(t).get(Real());
Real step = (*step_)(t).get(Real());
+ Real prev = index;
if (step == 0) return false;
if (step == 0) return false;
@@
-165,14
+166,14
@@
ValueNode_Duplicate::step(Time t)const
if (from < to)
{
if (from < to)
{
- index += step;
- return index <= to;
+ if ((index += step) <= to) return true;
}
else
}
else
- {
- index -= step;
- return index >= to;
- }
+ if ((index -= step) >= to) return true;
+
+ // at the end of the loop, leave the index at the last value that was used
+ index = prev;
+ return false;
}
int
}
int
@@
-188,7
+189,7
@@
ValueNode_Duplicate::count_steps(Time t)const
}
ValueBase
}
ValueBase
-ValueNode_Duplicate::operator()(Time t)const
+ValueNode_Duplicate::operator()(Time t
__attribute__ ((unused))
)const
{
return index;
}
{
return index;
}
@@
-206,7
+207,7
@@
ValueNode_Duplicate::get_local_name()const
}
bool
}
bool
-ValueNode_Duplicate::check_type(ValueBase::Type type)
+ValueNode_Duplicate::check_type(ValueBase::Type type
__attribute__ ((unused))
)
{
// never offer this as a choice. it's used automatically by the 'Duplicate' layer.
return false;
{
// never offer this as a choice. it's used automatically by the 'Duplicate' layer.
return false;