projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use link_count from children vocabulary and return the stored vocabulary if already...
[synfig.git]
/
synfig-core
/
src
/
synfig
/
valuenode_join.cpp
diff --git
a/synfig-core/src/synfig/valuenode_join.cpp
b/synfig-core/src/synfig/valuenode_join.cpp
index
bc01031
..
98edb47
100644
(file)
--- a/
synfig-core/src/synfig/valuenode_join.cpp
+++ b/
synfig-core/src/synfig/valuenode_join.cpp
@@
-55,6
+55,8
@@
using namespace synfig;
ValueNode_Join::ValueNode_Join(const ValueBase &value):
LinkableValueNode(value.get_type())
{
ValueNode_Join::ValueNode_Join(const ValueBase &value):
LinkableValueNode(value.get_type())
{
+ Vocab ret(get_children_vocab());
+ set_children_vocab(ret);
switch(value.get_type())
{
case ValueBase::TYPE_STRING:
switch(value.get_type())
{
case ValueBase::TYPE_STRING:
@@
-229,6
+231,9
@@
ValueNode_Join::check_type(ValueBase::Type type)
LinkableValueNode::Vocab
ValueNode_Join::get_children_vocab_vfunc()const
{
LinkableValueNode::Vocab
ValueNode_Join::get_children_vocab_vfunc()const
{
+ if(children_vocab.size())
+ return children_vocab;
+
LinkableValueNode::Vocab ret;
ret.push_back(ParamDesc(ValueBase(),"strings")
LinkableValueNode::Vocab ret;
ret.push_back(ParamDesc(ValueBase(),"strings")