X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer.h;h=a867197907b6c208f37071153f54d4610b4d9043;hb=d4cb326591ea23f82d341eb368b3d183b46f56c7;hp=51a47a0b2b9985b5488cf559d71b4db087c72e30;hpb=95e671c091f35812d7c83559c595ebfd3ce45cb4;p=synfig.git

diff --git a/synfig-core/src/synfig/layer.h b/synfig-core/src/synfig/layer.h
index 51a47a0..a867197 100644
--- a/synfig-core/src/synfig/layer.h
+++ b/synfig-core/src/synfig/layer.h
@@ -93,7 +93,7 @@
 	if (param==y && value.same_type_as(x))												\
 	{																					\
 		value.put(&x);																	\
-		set_param_static(#x,value.get_static());										\
+		set_param_static(y,value.get_static());										\
 		return true;																	\
 	}
 
@@ -129,7 +129,7 @@
 //! This is used as the category for layer book entries which represent aliases of layers.
 //! It prevents these layers showing up in the menu.
 #define CATEGORY_DO_NOT_USE "Do Not Use"
-
+/*
 //! x=variable name, y=static bool value
 #define SET_STATIC(x,y)																	\
 	if(param==#x && x ## _static != y)													\
@@ -141,7 +141,7 @@
 #define GET_STATIC(x)																	\
 	if(param==#x)																		\
 		return x ## _static;															\
-
+*/
 
 /* === T Y P E D E F S ===================================================== */
 
@@ -273,7 +273,8 @@ private:
 	float z_depth;
 
 	//! True if zdepth is not affected when in animation mode
-	bool z_depth_static;
+	typedef std::map<String, bool> Sparams;
+	Sparams static_params;
 
 	//! \writeme
 	mutable Time dirty_time_;
@@ -470,6 +471,7 @@ public:
 
 	virtual bool set_param_static(const String &param, const bool x);
 	virtual bool get_param_static(const String &param) const;
+	virtual void fill_static(Vocab vocab);
 
 	//!	Sets a list of parameters
 	virtual bool set_param_list(const ParamList &);