X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer_composite.h;h=46a07b656141fd26bc437b2e4cb25f2308d12553;hb=d43ed398fd84b93b96eb91d91dafdf65c80537e6;hp=7c9481168a47b926e12e9f6b35c35bcd0f928dcb;hpb=e6b894ac0b503008a3e42049aed30d116db28630;p=synfig.git

diff --git a/synfig-core/src/synfig/layer_composite.h b/synfig-core/src/synfig/layer_composite.h
index 7c94811..46a07b6 100644
--- a/synfig-core/src/synfig/layer_composite.h
+++ b/synfig-core/src/synfig/layer_composite.h
@@ -49,25 +49,14 @@ class Layer_Composite : public Layer
 {
 private:
 	//! The amount of composite
-	float amount_;
+	float amount;
 	//! The blend method for the composition
-	Color::BlendMethod blend_method_;
-	bool amount_static;
-	bool blend_method_static;
+	Color::BlendMethod blend_method;
 
 protected:
 	//! Default constructor. Not used directly.
-	Layer_Composite(
-		float 	amount=1.0,
-		Color::BlendMethod 	blend_method=Color::BLEND_COMPOSITE
-	):
-		amount_				(amount),
-		blend_method_		(blend_method),
-		converted_blend_	(false),
-		transparent_color_	(false),
-		amount_static		(false),
-		blend_method_static	(true)
-	{ }
+	Layer_Composite(float amount=1.0, Color::BlendMethod blend_method=Color::BLEND_COMPOSITE);
+
 	//! Converted blend is used to check if an old version of canvas
 	//! is used in the composition. Old Straight was used as new Composite
 	//! \todo verify this
@@ -78,17 +67,17 @@ protected:
 
 public:
 	//! Gets the amount of the layer
-	float get_amount()const { return amount_; }
+	float get_amount()const { return amount; }
 	//! Sets the amount of the layer and returns this layer
-	Layer_Composite& set_amount(float x) { amount_=x; return *this; }
+	Layer_Composite& set_amount(float x) { amount=x; return *this; }
 	//! Gets the blend method of the layer
-	Color::BlendMethod get_blend_method()const { return blend_method_; }
+	Color::BlendMethod get_blend_method()const { return blend_method; }
 	//! Sets the blend method of the layer and returns this layer
-	Layer_Composite& set_blend_method(Color::BlendMethod x) { blend_method_=x; return *this; }
+	Layer_Composite& set_blend_method(Color::BlendMethod x) { blend_method=x; return *this; }
 	//! Returns true is amount is 1 and blend method is straight
-	virtual bool is_solid_color()const { return amount_==1.0f && blend_method_==Color::BLEND_STRAIGHT; }
+	virtual bool is_solid_color()const { return amount==1.0f && blend_method==Color::BLEND_STRAIGHT; }
 	//! Returns true if the amount is zero.
-	bool is_disabled()const { return amount_==0.0f; }
+	bool is_disabled()const { return amount==0.0f; }
 	//! Gets the parameter vocabulary. To be overrided by the derived.
 	virtual Vocab get_param_vocab()const;
 	//! Sets the value for the given parameter.
@@ -97,8 +86,6 @@ public:
 	virtual ValueBase get_param(const String &param)const;
 	//!Returns the rectangle that includes the context of the layer and
 	//! the intersection of the layer in case it is active and not onto
-	virtual bool set_param_static(const String &param, const bool x);
-	virtual bool get_param_static(const String &param) const;
 	virtual Rect get_full_bounding_rect(Context context)const;
 	//! Renders the layer composited on the context and puts it on the target surface.
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;