X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer_composite.cpp;h=7b9e0bf1cedfeeca1189d9c84cba7f9e5197250c;hb=1fef3b35eff2620933131aaa9eca48a1656cef3d;hp=5d03787d7979e1b9ebec2f3fe1660f21e7de2eb5;hpb=6054e41d9bd09ab2addaef1eeb45798a99e77d70;p=synfig.git diff --git a/synfig-core/src/synfig/layer_composite.cpp b/synfig-core/src/synfig/layer_composite.cpp index 5d03787..7b9e0bf 100644 --- a/synfig-core/src/synfig/layer_composite.cpp +++ b/synfig-core/src/synfig/layer_composite.cpp @@ -157,11 +157,15 @@ bool Layer_Composite::set_param(const String & param, const ValueBase &value) { if(param=="amount" && value.same_type_as(amount_)) + { amount_=value.get(amount_); + amount_static=value.get_static(); + } else if(param=="blend_method" && value.same_type_as(int())) { blend_method_ = static_cast(value.get(int())); + blend_method_static=value.get_static(); if (blend_method_ < 0 || blend_method_ >= Color::BLEND_END) { @@ -205,12 +209,42 @@ Layer_Composite::set_param(const String & param, const ValueBase &value) ValueBase Layer_Composite::get_param(const String & param)const { + //! First check if the parameter's string is known. if(param=="amount") - return get_amount(); + { + synfig::ValueBase ret(get_amount()); + ret.set_static(amount_static); + return ret; + } if(param=="blend_method") - return static_cast(get_blend_method()); + { + synfig::ValueBase ret(static_cast(get_blend_method())); + ret.set_static(blend_method_static); + return ret; + } //! If it is unknown then call the ancestor's get param member //! to see if it can handle that parameter's string. return Layer::get_param(param); } + +bool +Layer_Composite::set_param_static(const String ¶m, const bool x) +{ + + SET_STATIC(amount, x) + SET_STATIC(blend_method, x) + + return Layer::set_param_static(param, x); +} + + +bool +Layer_Composite::get_param_static(const String ¶m) const +{ + + GET_STATIC(amount); + GET_STATIC(blend_method); + + return Layer::get_param_static(param); +}