projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disabling and reenabling a layer under a timeloop layer was causing the layer to...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_composite.h
diff --git
a/synfig-core/trunk/src/synfig/layer_composite.h
b/synfig-core/trunk/src/synfig/layer_composite.h
index
9a5b808
..
50aeeff
100644
(file)
--- 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
**
/*! \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
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 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
**
** 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
/*! \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
{
*/
class Layer_Composite : public Layer
{
@@
-59,9
+60,14
@@
protected:
Color::BlendMethod blend_method=Color::BLEND_COMPOSITE
):
amount_ (amount),
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_; }
public:
float get_amount()const { return amount_; }
@@
-72,7
+78,7
@@
public:
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; }
- 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; }
bool is_disabled()const { return amount_==0.0f; }