summaryrefslogtreecommitdiff
path: root/rotord/rotor.h
diff options
context:
space:
mode:
authorTim Redfern <tim@herge.(none)>2013-07-17 10:34:37 +0100
committerTim Redfern <tim@herge.(none)>2013-07-17 10:34:37 +0100
commit3057a3ab06909fe9eecef119414d257019414ebf (patch)
tree9778115f3b72825c55de00b318e8a3128b7a2f2c /rotord/rotor.h
parentf7fcf8cdea57a043b99d90549407195ea1148042 (diff)
alpha merge and blend
Diffstat (limited to 'rotord/rotor.h')
-rwxr-xr-xrotord/rotor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/rotord/rotor.h b/rotord/rotor.h
index 1f4c423..055d0b7 100755
--- a/rotord/rotor.h
+++ b/rotord/rotor.h
@@ -1268,7 +1268,7 @@ namespace Rotor {
image=(((Image_node*)image_inputs[0]->connection)->get_output(frame))->clone();
if (image_inputs.size()>1) {
if (image_inputs[1]->connection) {
- image->alpha_merge(*((Image_node*)image_inputs[0]->connection)->get_output(frame));
+ image->alpha_merge(*((Image_node*)image_inputs[1]->connection)->get_output(frame));
}
}
//if there aren't 2 image inputs connected just return the first