diff options
| author | jules@lens <julescarbon@gmail.com> | 2018-08-24 14:51:32 +0200 |
|---|---|---|
| committer | jules@lens <julescarbon@gmail.com> | 2018-08-24 14:51:32 +0200 |
| commit | 5b8aae739cd774956b9465ece3ce92b424a38d69 (patch) | |
| tree | f68e58f6e5eb255607233ed2dcc8409cd7c0d141 | |
| parent | f7b4fe32e15c1b9da8df82fc82a9609ba8407af7 (diff) | |
| parent | 25e0f92d84a15ecf952a5ba544a876ad04ed5b1e (diff) | |
Merge branch 'master' of asdf.us:live-cortex
| -rw-r--r-- | app/client/modules/pix2pixhd/views/pix2pixhd.live.js | 2 | ||||
| -rw-r--r-- | rpc/img_ops.py | 3 |
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)) |