projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'genete_static_values'
[synfig.git]
/
synfig-core
/
src
/
synfig
/
layer.cpp
diff --git
a/synfig-core/src/synfig/layer.cpp
b/synfig-core/src/synfig/layer.cpp
index
0485b34
..
3569a5a
100644
(file)
--- 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();
{
_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
}
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)
{
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;
}
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;
}
return false;
}