Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Picard <pioverfour>2020-06-22 14:15:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-06-22 14:34:56 +0300
commit961fa2251ef5042cd5e3d3cf1897769434da3452 (patch)
tree494002d62ae4bc463037edf3e697451fa6586e44 /release
parentc877c3b8f65c094f9a41c12a26fc9d0c7f160c7e (diff)
External Player: update DJV to version 2
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_operators/screen_play_rendered_anim.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
index 4253b4b8682..255852d3b26 100644
--- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
+++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
@@ -34,13 +34,9 @@ def guess_player_path(preset):
return bpy.app.binary_path
elif preset == 'DJV':
- player_path = "djv_view"
-
+ player_path = "djv"
if sys.platform == "darwin":
- # TODO, crummy supporting only 1 version,
- # could find the newest installed version
- test_path = ("/Applications/djv-0.8.2.app"
- "/Contents/Resources/bin/djv_view")
+ test_path = "/Applications/DJV2.app/Contents/Resources/bin/djv"
if os.path.exists(test_path):
player_path = test_path
@@ -138,7 +134,13 @@ class PlayRenderedAnim(Operator):
]
cmd.extend(opts)
elif preset == 'DJV':
- opts = [file, "-playback_speed", str(int(fps_final))]
+ opts = [
+ file,
+ "-speed", str(fps_final),
+ "-in_out", str(frame_start), str(frame_end),
+ "-frame", str(scene.frame_current),
+ "-time_units", "Frames"
+ ]
cmd.extend(opts)
elif preset == 'FRAMECYCLER':
opts = [file, f"{scene.frame_start:d}-{scene.frame_end:d}"]