projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove under score from the z_depth parameter to allow use the macros properly
[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
e4e7f25
..
17984ba
100644
(file)
--- a/
synfig-core/src/synfig/layer.cpp
+++ b/
synfig-core/src/synfig/layer.cpp
@@
-135,9
+135,9
@@
Layer::subsys_stop()
Layer::Layer():
active_(true),
Layer::Layer():
active_(true),
- z_depth
_
(0.0f),
+ z_depth(0.0f),
dirty_time_(Time::end()),
dirty_time_(Time::end()),
- z_depth_
_
static(false)
+ z_depth_static(false)
{
_LayerCounter::counter++;
}
{
_LayerCounter::counter++;
}
@@
-293,14
+293,14
@@
Layer::on_changed()
bool
Layer::set_param(const String ¶m, const ValueBase &value)
{
bool
Layer::set_param(const String ¶m, const ValueBase &value)
{
- IMPORT
_AS(z_depth_,"z_depth"
)
+ IMPORT
(z_depth
)
return false;
}
bool
Layer::set_param_static(const String ¶m, const bool x)
{
return false;
}
bool
Layer::set_param_static(const String ¶m, const bool x)
{
- SET_STATIC(z_depth
_
,x)
+ SET_STATIC(z_depth,x)
return false;
}
return false;
}
@@
-309,7
+309,7
@@
Layer::set_param_static(const String ¶m, const bool x)
bool
Layer::get_param_static(const String ¶m) const
{
bool
Layer::get_param_static(const String ¶m) const
{
- GET_STATIC(z_depth
_
);
+ GET_STATIC(z_depth);
return false;
}
return false;
}
@@
-325,7
+325,7
@@
float
Layer::get_z_depth(const synfig::Time& t)const
{
if(!dynamic_param_list().count("z_depth"))
Layer::get_z_depth(const synfig::Time& t)const
{
if(!dynamic_param_list().count("z_depth"))
- return z_depth
_
;
+ return z_depth;
return (*dynamic_param_list().find("z_depth")->second)(t).get(Real());
}
return (*dynamic_param_list().find("z_depth")->second)(t).get(Real());
}
@@
-466,7
+466,7
@@
Layer::get_param(const String & param)const
if(param=="z_depth")
{
synfig::ValueBase ret(get_z_depth());
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();
return ret;
}
return ValueBase();
@@
-562,7
+562,7
@@
Layer::get_param_vocab()const
{
Layer::Vocab ret;
{
Layer::Vocab ret;
- ret.push_back(ParamDesc(z_depth
_
,"z_depth")
+ ret.push_back(ParamDesc(z_depth,"z_depth")
.set_local_name(_("Z Depth"))
.set_animation_only(true)
);
.set_local_name(_("Z Depth"))
.set_animation_only(true)
);