X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer.cpp;h=ae25ab49f5dcda0d77b76f4f0f66ff68a2e567eb;hb=42e8f249832b9ca81691bbf76a6668aa4612117f;hp=0485b342ba4187db38d41eef8e537ad3d60fbe27;hpb=cf2dbea77c392e29f5c359819977a8ba63667e42;p=synfig.git diff --git a/synfig-core/src/synfig/layer.cpp b/synfig-core/src/synfig/layer.cpp index 0485b34..ae25ab4 100644 --- a/synfig-core/src/synfig/layer.cpp +++ b/synfig-core/src/synfig/layer.cpp @@ -141,11 +141,7 @@ Layer::Layer(): { _LayerCounter::counter++; Vocab vocab=get_param_vocab(); - Vocab::const_iterator viter; - for(viter=vocab.begin();viter!=vocab.end();viter++) - { - static_params.insert(make_pair(viter->get_name(),false)); - } + fill_static(vocab); } Layer::LooseHandle @@ -306,37 +302,34 @@ Layer::set_param(const String ¶m, const ValueBase &value) bool Layer::set_param_static(const String ¶m, const bool x) { - Sparams::iterator iter; - - for(iter=static_params.begin();iter!=static_params.end();iter++) + Sparams::iterator iter=static_params.find(param); + if(iter!=static_params.end()) { - if(iter->first == param) - { - iter->second = x; - return true; - } + iter->second=x; + return true; } - //SET_STATIC(z_depth,x) - return false; } -bool -Layer::get_param_static(const String ¶m) const +void Layer::fill_static(Vocab vocab) { - - Sparams::const_iterator iter; - - for(iter=static_params.begin();iter!=static_params.end();iter++) + Vocab::const_iterator viter; + for(viter=vocab.begin();viter!=vocab.end();viter++) { - if(iter->first == param) - { - return iter->second; - } + if(static_params.find(viter->get_name())==static_params.end()) + static_params.insert(make_pair(viter->get_name(),false)); } - //GET_STATIC(z_depth); +} + + +bool +Layer::get_param_static(const String ¶m) const +{ + Sparams::const_iterator iter=static_params.find(param); + if(iter!=static_params.end()) + return iter->second; return false; } @@ -591,6 +584,7 @@ Layer::get_param_vocab()const ret.push_back(ParamDesc(z_depth,"z_depth") .set_local_name(_("Z Depth")) .set_animation_only(true) + .set_description(_("Modifies the position of the layer in the layer stack")) ); return ret;