X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer.cpp;h=e4e7f25ac05e1cb9fa64aaec0a8dda2d84e12cdb;hb=c03c4194371a7030144d0897ecbb8e6282379cd5;hp=3106d8c46755e0dccadd1a656b2184deb08b181c;hpb=e6b894ac0b503008a3e42049aed30d116db28630;p=synfig.git diff --git a/synfig-core/src/synfig/layer.cpp b/synfig-core/src/synfig/layer.cpp index 3106d8c..e4e7f25 100644 --- a/synfig-core/src/synfig/layer.cpp +++ b/synfig-core/src/synfig/layer.cpp @@ -136,7 +136,8 @@ Layer::subsys_stop() Layer::Layer(): active_(true), z_depth_(0.0f), - dirty_time_(Time::end()) + dirty_time_(Time::end()), + z_depth__static(false) { _LayerCounter::counter++; } @@ -292,23 +293,14 @@ Layer::on_changed() bool Layer::set_param(const String ¶m, const ValueBase &value) { - if(param=="z_depth" && value.same_type_as(z_depth_)) - { - z_depth_=value.get(z_depth_); - z_depth_static=value.get_static(); - return true; - } + IMPORT_AS(z_depth_,"z_depth") return false; } bool Layer::set_param_static(const String ¶m, const bool x) { - if(param=="z_depth" && z_depth_static!=x) - { - z_depth_static=x; - return true; - } + SET_STATIC(z_depth_,x) return false; } @@ -317,8 +309,7 @@ Layer::set_param_static(const String ¶m, const bool x) bool Layer::get_param_static(const String ¶m) const { - if(param=="z_depth") - return z_depth_static; + GET_STATIC(z_depth_); return false; } @@ -475,7 +466,7 @@ Layer::get_param(const String & param)const if(param=="z_depth") { synfig::ValueBase ret(get_z_depth()); - ret.set_static(z_depth_static); + ret.set_static(z_depth__static); return ret; } return ValueBase();