projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give the text tool a name for the tooltip and 'state' menu. Let's call it... "Text...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_duplicate.cpp
diff --git
a/synfig-core/trunk/src/synfig/layer_duplicate.cpp
b/synfig-core/trunk/src/synfig/layer_duplicate.cpp
index
a9d2f85
..
f9c77fa
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_duplicate.cpp
+++ b/
synfig-core/trunk/src/synfig/layer_duplicate.cpp
@@
-6,7
+6,7
@@
**
** \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
+** 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-70,7
+70,6
@@
Layer_Duplicate::Layer_Duplicate():
Layer::Handle
Layer_Duplicate::clone(const GUID& deriv_guid)const
{
Layer::Handle
Layer_Duplicate::clone(const GUID& deriv_guid)const
{
- printf("cloning layer duplicate\n");
Layer::Handle ret = (Layer::Handle)Layer_Composite::clone(deriv_guid);
const DynamicParamList &dpl = dynamic_param_list();
Layer::Handle ret = (Layer::Handle)Layer_Composite::clone(deriv_guid);
const DynamicParamList &dpl = dynamic_param_list();
@@
-78,7
+77,7
@@
Layer_Duplicate::clone(const GUID& deriv_guid)const
// if we have a dynamic "index" parameter, make a new one in the clone
// it's not good to have two references to the same index valuenode,
// if we have a dynamic "index" parameter, make a new one in the clone
// it's not good to have two references to the same index valuenode,
- // or nested duplicat
at
ions cause an infinite loop
+ // or nested duplications cause an infinite loop
if (iter != dpl.end())
ret->connect_dynamic_param(iter->first,iter->second->clone(deriv_guid));
if (iter != dpl.end())
ret->connect_dynamic_param(iter->first,iter->second->clone(deriv_guid));
@@
-184,7
+183,7
@@
Layer_Duplicate::accelerated_render(Context context,Surface *surface,int quality
if(!context.accelerated_render(&tmp,quality,renddesc,&subimagecb)) return false;
Surface::alpha_pen apen(surface->begin());
if(!context.accelerated_render(&tmp,quality,renddesc,&subimagecb)) return false;
Surface::alpha_pen apen(surface->begin());
- apen.set_alpha(
1.0
);
+ apen.set_alpha(
get_amount()
);
// \todo have a checkbox allowing use of 'behind' to reverse the order?
apen.set_blend_method(i ? blend_method : Color::BLEND_COMPOSITE);
tmp.blit_to(apen);
// \todo have a checkbox allowing use of 'behind' to reverse the order?
apen.set_blend_method(i ? blend_method : Color::BLEND_COMPOSITE);
tmp.blit_to(apen);