Author: Konstantin Dmitriev <[email protected]>
Date: Thu Jan 10 18:17:25 2013 +0700
Fix and enable Integer convert type
---
synfig-core/src/synfig/valuenode.cpp | 2 +-
synfig-core/src/synfig/valuenode_integer.cpp | 16 +++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/synfig-core/src/synfig/valuenode.cpp
b/synfig-core/src/synfig/valuenode.cpp
index 7cb3c44..d2d0453 100644
--- a/synfig-core/src/synfig/valuenode.cpp
+++ b/synfig-core/src/synfig/valuenode.cpp
@@ -165,7 +165,7 @@ ValueNode::subsys_init()
ADD_VALUENODE(ValueNode_TimeLoop, "timeloop",
_("Time Loop"), RELEASE_VERSION_0_61_08); // SVN r1226
ADD_VALUENODE(ValueNode_Reciprocal, "reciprocal",
_("Reciprocal"), RELEASE_VERSION_0_61_08); // SVN r1238
ADD_VALUENODE(ValueNode_Duplicate, "duplicate",
_("Duplicate"), RELEASE_VERSION_0_61_08); // SVN r1267
- ADD_VALUENODE(ValueNode_Integer, "fromint",
_("From Integer"), RELEASE_VERSION_0_61_08); // SVN r1267
+ ADD_VALUENODE(ValueNode_Integer, "fromint",
_("Integer"), RELEASE_VERSION_0_61_08); // SVN r1267
ADD_VALUENODE(ValueNode_Step, "step",
_("Step"), RELEASE_VERSION_0_61_08); // SVN r1691
ADD_VALUENODE(ValueNode_BLineCalcWidth, "blinecalcwidth",
_("BLine Width"), RELEASE_VERSION_0_61_08); // SVN r1694
diff --git a/synfig-core/src/synfig/valuenode_integer.cpp
b/synfig-core/src/synfig/valuenode_integer.cpp
index 99a0924..2f22e13 100644
--- a/synfig-core/src/synfig/valuenode_integer.cpp
+++ b/synfig-core/src/synfig/valuenode_integer.cpp
@@ -106,7 +106,7 @@ ValueNode_Integer::set_link_vfunc(int i,ValueNode::Handle
value)
switch(i)
{
- case 0: CHECK_TYPE_AND_SET_VALUE(integer_, get_type());
+ case 0: CHECK_TYPE_AND_SET_VALUE(integer_, ValueBase::TYPE_INTEGER);
}
return false;
}
@@ -154,19 +154,17 @@ ValueNode_Integer::get_name()const
String
ValueNode_Integer::get_local_name()const
{
- return _("From Integer");
+ return _("Integer");
}
-// don't show this to the user at the moment - maybe it's not very useful
bool
ValueNode_Integer::check_type(ValueBase::Type type __attribute__ ((unused)))
{
- return false;
-// return
-// type==ValueBase::TYPE_ANGLE ||
-// type==ValueBase::TYPE_BOOL ||
-// type==ValueBase::TYPE_REAL ||
-// type==ValueBase::TYPE_TIME;
+ return
+ type==ValueBase::TYPE_ANGLE ||
+ type==ValueBase::TYPE_BOOL ||
+ type==ValueBase::TYPE_REAL ||
+ type==ValueBase::TYPE_TIME;
}
LinkableValueNode::Vocab
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
