X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer.cpp;h=2a5a90b04ed91c313849575e19e4a34482b840ab;hb=1967f77108f0b1e1e00b4ed81ad636c50ccb351a;hp=8fcbfbff9843dcfffd41611292315f7bc5ea43ce;hpb=adfc80c126f482d7ea2bac38001a2c4a7c7df88c;p=synfig.git diff --git a/synfig-core/src/synfig/layer.cpp b/synfig-core/src/synfig/layer.cpp index 8fcbfbf..2a5a90b 100644 --- a/synfig-core/src/synfig/layer.cpp +++ b/synfig-core/src/synfig/layer.cpp @@ -23,8 +23,6 @@ /* === H E A D E R S ======================================================= */ -#define SYNFIG_NO_ANGLE - #ifdef USING_PCH # include "pch.h" #else @@ -138,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++; } @@ -294,14 +293,35 @@ Layer::on_changed() bool Layer::set_param(const String ¶m, const ValueBase &value) { - if(param=="z_depth" && value.same_type_as(z_depth_)) +/* if(param=="z_depth" && value.same_type_as(z_depth_)) { z_depth_=value.get(z_depth_); + set_param_static(param, value.get_static()); return true; } + */ + IMPORT_AS(z_depth_,"z_depth") + return false; +} + +bool +Layer::set_param_static(const String ¶m, const bool x) +{ + SET_STATIC(z_depth,x) + + return false; +} + + +bool +Layer::get_param_static(const String ¶m) const +{ + GET_STATIC(z_depth); + return false; } + etl::handle Layer::get_transform()const { @@ -451,8 +471,11 @@ ValueBase Layer::get_param(const String & param)const { if(param=="z_depth") - return get_z_depth(); - + { + synfig::ValueBase ret(get_z_depth()); + ret.set_static(z_depth_static); + return ret; + } return ValueBase(); }