From 5d8802e44adf01a1d8dd70dcbd5357d8641f37f9 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Thu, 5 Dec 2013 11:16:04 +0000 Subject: xml loader tweak --- rotord/src/rotor.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'rotord/src/rotor.h') diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index 50fcef7..e00ebd6 100644 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -656,7 +656,7 @@ namespace Rotor { //awkward, its getting close to the point where we just need access to all of the segments data everywhere? //we have 2 times here - if (attributes["mode"]->intVal>=CYCLER_mix&&image_inputs.size()>1){ + if ((attributes["mode"]->intVal>CYCLER_cut)&&(image_inputs.size()>1)){ int im1=seg%image_inputs.size(); int im2=prevseg%image_inputs.size(); @@ -708,8 +708,7 @@ namespace Rotor { case CYCLER_max: image=image.max(i2); break; - case CYCLER_mix: //has to be last because of initialser of *in? go figure - + case CYCLER_mix: image+=i2; break; } -- cgit v1.2.3