X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fsynfigapp%2Factions%2Flayerparamsetstatic.cpp;h=5ea89abbe2f15adb3832f21a2f526028ac153eb4;hb=0e1189c5ccde78c9d0212467e68dc0606505208d;hp=24d3be4c398357c0f3d1e63c20cadb30bb73827c;hpb=e6b894ac0b503008a3e42049aed30d116db28630;p=synfig.git diff --git a/synfig-studio/src/synfigapp/actions/layerparamsetstatic.cpp b/synfig-studio/src/synfigapp/actions/layerparamsetstatic.cpp index 24d3be4..5ea89ab 100644 --- a/synfig-studio/src/synfigapp/actions/layerparamsetstatic.cpp +++ b/synfig-studio/src/synfigapp/actions/layerparamsetstatic.cpp @@ -47,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::LayerParamSetStatic); ACTION_SET_NAME(Action::LayerParamSetStatic,"LayerParamSetStatic"); -ACTION_SET_LOCAL_NAME(Action::LayerParamSetStatic,N_("Set Layer Parameter Static")); +ACTION_SET_LOCAL_NAME(Action::LayerParamSetStatic,N_("Forbid Animation")); ACTION_SET_TASK(Action::LayerParamSetStatic,"setstatic"); ACTION_SET_CATEGORY(Action::LayerParamSetStatic,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::LayerParamSetStatic,0); @@ -99,9 +99,12 @@ Action::LayerParamSetStatic::is_candidate(const ParamList &x) //!Check that the parameter is not Value Node (Const, Animated or Linkable) if(_layer->dynamic_param_list().count(_param_name)) return false; - //! Retrieves the current parameter parameter = _layer->get_param(_param_name); + //! Check that the parameter is not a inline canvas + if(parameter.get_type()==ValueBase::TYPE_CANVAS && parameter.get(Canvas::Handle())) + if(parameter.get(Canvas::Handle())->is_inline()) + return false; //! Check if it is already static if(parameter.get_static()) return false;