X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescblinelink.cpp;h=6f15ccb8da26e91cfcce02812e4c559347047033;hb=1e0ddeb566a2766b85bffc17e501721cc025d851;hp=1c21040d5129f7450702c0a42bb4703ead1bece9;hpb=acb13618841e7cecba6f4c989b7670909f8ac235;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp index 1c21040..6f15ccb 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescblinelink.cpp @@ -55,7 +55,7 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::ValueDescBLineLink); -ACTION_SET_NAME(Action::ValueDescBLineLink,"value_desc_bline_link"); +ACTION_SET_NAME(Action::ValueDescBLineLink,"ValueDescBLineLink"); ACTION_SET_LOCAL_NAME(Action::ValueDescBLineLink,N_("Link to BLine")); ACTION_SET_TASK(Action::ValueDescBLineLink,"connect"); ACTION_SET_CATEGORY(Action::ValueDescBLineLink,Action::CATEGORY_BEZIER); @@ -165,7 +165,7 @@ Action::ValueDescBLineLink::prepare() ValueNode_DynamicList::Handle bline_value_node(ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())); bool loop(bline_value_node->get_loop()); int loop_adjust(loop ? 0 : -1); - const std::vector bline((*bline_value_node)(time)); + const std::vector bline((*bline_value_node)(time).get_list()); int size = bline.size(); Real amount = (index + origin + loop_adjust) / (size + loop_adjust); LinkableValueNode::Handle calculated_value_node; @@ -189,6 +189,8 @@ Action::ValueDescBLineLink::prepare() calculated_value_node = ValueNode_BLineCalcTangent::create(ValueBase::TYPE_VECTOR); else if (link_name == "width") calculated_value_node = ValueNode_BLineCalcWidth::create(ValueBase::TYPE_REAL); + else if (link_name == "point") + calculated_value_node = ValueNode_BLineCalcVertex::create(ValueBase::TYPE_VECTOR); else { synfig::warning("can't link '%s'", link_name.c_str()); @@ -243,6 +245,9 @@ Action::ValueDescBLineLink::prepare() // REAL layer parameter else if (value_desc.get_value_type() == ValueBase::TYPE_REAL) calculated_value_node = ValueNode_BLineCalcWidth::create(ValueBase::TYPE_REAL); + // ANGLE layer parameter + else if (value_desc.get_value_type() == ValueBase::TYPE_ANGLE) + calculated_value_node = ValueNode_BLineCalcTangent::create(ValueBase::TYPE_ANGLE); else continue;