projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added copyright lines for files I've edited this year.
[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
922704a
..
09c9e77
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
@@
-173,6
+173,7
@@
Layer_Duplicate::accelerated_render(Context context,Surface *surface,int quality
Color::BlendMethod blend_method(get_blend_method());
int steps = duplicate_param->count_steps(time_cur);
Color::BlendMethod blend_method(get_blend_method());
int steps = duplicate_param->count_steps(time_cur);
+ Mutex::Lock lock(mutex);
duplicate_param->reset_index(time_cur);
do
{
duplicate_param->reset_index(time_cur);
do
{
@@
-183,14
+184,12
@@
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?
// \todo have a checkbox allowing use of 'behind' to reverse the order?
- apen.set_blend_method(
blend_method
);
+ apen.set_blend_method(
i ? blend_method : Color::BLEND_COMPOSITE
);
tmp.blit_to(apen);
i++;
} while (duplicate_param->step(time_cur));
tmp.blit_to(apen);
i++;
} while (duplicate_param->step(time_cur));
- duplicate_param->reset_index(time_cur);
-
return true;
}
return true;
}