When setting a parameter in Layer Composite keep the static values of the given Value...

[synfig.git] / synfig-core / src / synfig / layer_composite.cpp

diff --git a/synfig-core/src/synfig/layer_composite.cpp b/synfig-core/src/synfig/layer_composite.cpp
index 24cae52..7b9e0bf 100644 (file)
--- 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<Color::BlendMethod>(value.get(int()));
+               blend_method_static=value.get_static();
 
                if (blend_method_ < 0 || blend_method_ >= Color::BLEND_END)
                {
@@ -227,16 +231,9 @@ Layer_Composite::get_param(const String & param)const
 bool
 Layer_Composite::set_param_static(const String &param, const bool x)
 {
-       if(param=="amount" && amount_static!=x)
-       {
-               amount_static=x;
-               return true;
-       }
-       if(param=="blend_method" && blend_method_static!=x)
-       {
-               blend_method_static=x;
-               return true;
-       }
+
+       SET_STATIC(amount, x)
+       SET_STATIC(blend_method, x)
 
        return Layer::set_param_static(param, x);
 }
@@ -246,11 +243,8 @@ bool
 Layer_Composite::get_param_static(const String &param) const
 {
 
-       if(param=="amount")
-               return amount_static;
-
-       if(param=="blend_method")
-               return blend_method_static;
+       GET_STATIC(amount);
+       GET_STATIC(blend_method);
 
        return Layer::get_param_static(param);
 }