From c03c4194371a7030144d0897ecbb8e6282379cd5 Mon Sep 17 00:00:00 2001
From: Carlos Lopez <genetita@gmail.com>
Date: Thu, 26 Aug 2010 17:52:55 +0200
Subject: [PATCH] Rename z_depth_static to z_depth__static to make proper use
 of the macros. Fix load z_depth_ static option properly

---
 synfig-core/src/synfig/layer.cpp | 15 ++++-----------
 synfig-core/src/synfig/layer.h   |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/synfig-core/src/synfig/layer.cpp b/synfig-core/src/synfig/layer.cpp
index 2a5a90b..e4e7f25 100644
--- a/synfig-core/src/synfig/layer.cpp
+++ b/synfig-core/src/synfig/layer.cpp
@@ -137,7 +137,7 @@ Layer::Layer():
 	active_(true),
 	z_depth_(0.0f),
 	dirty_time_(Time::end()),
-	z_depth_static(false)
+	z_depth__static(false)
 {
 	_LayerCounter::counter++;
 }
@@ -293,13 +293,6 @@ Layer::on_changed()
 bool
 Layer::set_param(const String &param, const ValueBase &value)
 {
-/*	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;
 }
@@ -307,7 +300,7 @@ Layer::set_param(const String &param, const ValueBase &value)
 bool
 Layer::set_param_static(const String &param, const bool x)
 {
-	SET_STATIC(z_depth,x)
+	SET_STATIC(z_depth_,x)
 
 	return false;
 }
@@ -316,7 +309,7 @@ Layer::set_param_static(const String &param, const bool x)
 bool
 Layer::get_param_static(const String &param) const
 {
-	GET_STATIC(z_depth);
+	GET_STATIC(z_depth_);
 
 	return false;
 }
@@ -473,7 +466,7 @@ Layer::get_param(const String & param)const
 	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();
diff --git a/synfig-core/src/synfig/layer.h b/synfig-core/src/synfig/layer.h
index 8a6a2e6..87e91a1 100644
--- a/synfig-core/src/synfig/layer.h
+++ b/synfig-core/src/synfig/layer.h
@@ -273,7 +273,7 @@ private:
 	float z_depth_;
 
 	//! True if zdepth is not affected when in animation mode
-	bool z_depth_static;
+	bool z_depth__static;
 
 	//! \writeme
 	mutable Time dirty_time_;
-- 
2.7.4