projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
List the removed layers in the history dialog when removing layers.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_segcalcvertex.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
index
277a4cf
..
91c55e0
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
@@
-58,7
+58,7
@@
ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(const ValueBase::Type &x):
LinkableValueNode(x)
{
if(x!=ValueBase::TYPE_VECTOR)
LinkableValueNode(x)
{
if(x!=ValueBase::TYPE_VECTOR)
- throw Exception::BadType(ValueBase::type_name(x));
+ throw Exception::BadType(ValueBase::type_
local_
name(x));
set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
set_link("amount",ValueNode_Const::create(Real(0.5)));
set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
set_link("amount",ValueNode_Const::create(Real(0.5)));
@@
-107,7
+107,8
@@
ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
bool
ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
{
bool
ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
{
segment_=x;
if(i==0)
{
segment_=x;
@@
-126,7
+127,8
@@
ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
ValueNode::LooseHandle
ValueNode_SegCalcVertex::get_link_vfunc(int i)const
{
ValueNode::LooseHandle
ValueNode_SegCalcVertex::get_link_vfunc(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return segment_;
if(i==1)
if(i==0)
return segment_;
if(i==1)
@@
-144,7
+146,8
@@
ValueNode_SegCalcVertex::link_count()const
String
ValueNode_SegCalcVertex::link_name(int i)const
{
String
ValueNode_SegCalcVertex::link_name(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return "segment";
if(i==1)
if(i==0)
return "segment";
if(i==1)
@@
-155,7
+158,8
@@
ValueNode_SegCalcVertex::link_name(int i)const
String
ValueNode_SegCalcVertex::link_local_name(int i)const
{
String
ValueNode_SegCalcVertex::link_local_name(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return _("Segment");
if(i==1)
if(i==0)
return _("Segment");
if(i==1)