X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_composite.h;h=cb9497dd357d6f2415f509dddeb37c6f0a1d2de6;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=37d96675bebbf4f50642545aefe310eb2a253e46;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_composite.h b/synfig-core/trunk/src/synfig/layer_composite.h
index 37d9667..cb9497d 100644
--- a/synfig-core/trunk/src/synfig/layer_composite.h
+++ b/synfig-core/trunk/src/synfig/layer_composite.h
@@ -2,10 +2,11 @@
 /*!	\file layer_composite.h
 **	\brief Composite Layer Class Implementation
 **
-**	$Id: layer_composite.h,v 1.2 2005/01/24 03:08:18 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -42,7 +43,7 @@ class Layer_NoDeform {};
 
 
 /*!	\class Layer_Composite
-**	\brief Base class for layers that put stuff ontop of lower layers
+**	\brief Base class for layers that put stuff on top of lower layers
 */
 class Layer_Composite : public Layer
 {
@@ -59,9 +60,14 @@ protected:
 		Color::BlendMethod 	blend_method=Color::BLEND_COMPOSITE
 	):
 		amount_				(amount),
-		blend_method_		(blend_method)
+		blend_method_		(blend_method),
+		converted_blend_	(false),
+		transparent_color_	(false)
 	{ }
 
+	bool converted_blend_;
+	bool transparent_color_;
+
 public:
 
 	float get_amount()const { return amount_; }
@@ -72,10 +78,10 @@ public:
 
 	Layer_Composite& set_blend_method(Color::BlendMethod x) { blend_method_=x; return *this; }
 
-	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; }
+
 	bool is_disabled()const { return amount_==0.0f; }
-	
+
 	virtual Vocab get_param_vocab()const;
 
 	virtual bool set_param(const String &param, const ValueBase &value);