projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partially fix 1702760: stop compiler warning about trgt_png.cpp.
[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
..
d7d47a1
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_composite.h
+++ b/
synfig-core/trunk/src/synfig/layer_composite.h
@@
-2,7
+2,7
@@
/*! \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
@@
-72,7
+72,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; }