projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use macros for the get static and set static members
[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
..
93f040a
100644
(file)
--- a/
synfig-core/src/synfig/layer_composite.cpp
+++ b/
synfig-core/src/synfig/layer_composite.cpp
@@
-227,16
+227,9
@@
Layer_Composite::get_param(const String & param)const
bool
Layer_Composite::set_param_static(const String ¶m, const bool x)
{
bool
Layer_Composite::set_param_static(const String ¶m, 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);
}
return Layer::set_param_static(param, x);
}
@@
-246,11
+239,8
@@
bool
Layer_Composite::get_param_static(const String ¶m) const
{
Layer_Composite::get_param_static(const String ¶m) 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);
}
return Layer::get_param_static(param);
}