X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescset.cpp;h=35f6d26ea0d996eb744095db1c8690bbdbc21ece;hb=d43ed398fd84b93b96eb91d91dafdf65c80537e6;hp=9b7a7d4650f71ffdc065329581dd8d2a4b716e74;hpb=39ed56eeecf6cbdc5e923df9020fa7dc3697737f;p=synfig.git diff --git a/synfig-studio/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/src/synfigapp/actions/valuedescset.cpp index 9b7a7d4..35f6d26 100644 --- a/synfig-studio/src/synfigapp/actions/valuedescset.cpp +++ b/synfig-studio/src/synfigapp/actions/valuedescset.cpp @@ -302,7 +302,7 @@ Action::ValueDescSet::prepare() case ValueBase::TYPE_VECTOR: { Angle old_angle = (*(ValueNode_RadialComposite::Handle::cast_dynamic( - value_desc.get_value_node())->get_link(1)))(time).get(Angle()); + value_desc.get_value_node())->get_link("theta")))(time).get(Angle()); Vector vect(value.get(Vector())); components[0]=vect.mag(); Angle change = Angle(Angle::tan(vect[1],vect[0])) - old_angle; @@ -446,9 +446,17 @@ Action::ValueDescSet::prepare() } */ - + ValueBase local_value; + local_value.set_static(false); + if(!value_desc.is_value_node() || ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node())) + { + if(value_desc.is_value_node()) + local_value=ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node())->get_value(); + else + local_value=value_desc.get_value(); + } // If we are in animate editing mode - if(get_edit_mode()&MODE_ANIMATE) + if(get_edit_mode()&MODE_ANIMATE && !local_value.get_static()) { ValueNode_Animated::Handle& value_node(value_node_animated); @@ -527,7 +535,8 @@ Action::ValueDescSet::prepare() if(ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node())) { Action::Handle action(ValueNodeConstSet::create()); - + synfig::ValueNode_Const::Handle localvaluenode(ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node())); + value.set_static(localvaluenode->get_static()); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_node",value_desc.get_value_node()); @@ -549,7 +558,8 @@ Action::ValueDescSet::prepare() if(value_desc.parent_is_layer_param() && !value_desc.is_value_node()) { Action::Handle layer_param_set(LayerParamSet::create()); - + synfig::ValueBase localvalue(value_desc.get_value()); + value.set_static(local_value.get_static()); layer_param_set->set_param("canvas",get_canvas()); layer_param_set->set_param("canvas_interface",get_canvas_interface()); layer_param_set->set_param("layer",value_desc.get_layer());