summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/client/modules/pix2pixhd/views/pix2pixhd.live.js2
-rw-r--r--rpc/img_ops.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
index 8cef4bd..b127e23 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
@@ -154,7 +154,7 @@ class Pix2PixHDLive extends Component {
<Slider live
title='skip frames'
name='sequence_skip'
- min={0} max={100} type='int'
+ min={0} max={1000} type='int'
/>
<Slider live
title='fade sequence'
diff --git a/rpc/img_ops.py b/rpc/img_ops.py
index 35268d6..e748af4 100644
--- a/rpc/img_ops.py
+++ b/rpc/img_ops.py
@@ -124,7 +124,8 @@ def mix_next_image(opt, data_opt, rpc_client, im, sequence, i=0, sequence_i=0, s
recursive_frac = data_opt.recursive_frac
sequence_frac = data_opt.sequence_frac
- if data_opt.sequence_skip > 0 and data_opt.fade_sequence > 0:
+
+ if data_opt.sequence_skip > 0 and data_opt.fade_sequence > 1:
sequence_frac *= (1.0 - (skip_i * data_opt.fade_sequence) / (data_opt.sequence_skip - 1))
sequence_frac = max(0, min(sequence_frac, 1))