projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename z_depth_static to z_depth__static to make proper use of the macros.
[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
8fcbfbf
..
e4e7f25
100644
(file)
--- 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 ======================================================= */
/* === H E A D E R S ======================================================= */
-#define SYNFIG_NO_ANGLE
-
#ifdef USING_PCH
# include "pch.h"
#else
#ifdef USING_PCH
# include "pch.h"
#else
@@
-138,7
+136,8
@@
Layer::subsys_stop()
Layer::Layer():
active_(true),
z_depth_(0.0f),
Layer::Layer():
active_(true),
z_depth_(0.0f),
- dirty_time_(Time::end())
+ dirty_time_(Time::end()),
+ z_depth__static(false)
{
_LayerCounter::counter++;
}
{
_LayerCounter::counter++;
}
@@
-294,14
+293,28
@@
Layer::on_changed()
bool
Layer::set_param(const String ¶m, const ValueBase &value)
{
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_);
- return true;
- }
+ IMPORT_AS(z_depth_,"z_depth")
return false;
}
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<Transform>
Layer::get_transform()const
{
etl::handle<Transform>
Layer::get_transform()const
{
@@
-451,8
+464,11
@@
ValueBase
Layer::get_param(const String & param)const
{
if(param=="z_depth")
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();
}
return ValueBase();
}