diff options
| -rw-r--r-- | release/scripts/startup/bl_operators/screen_play_rendered_anim.py | 16 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 4 |
2 files changed, 11 insertions, 9 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}"] diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index c18c08a87dc..fad564e807a 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5887,9 +5887,9 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) static const EnumPropertyItem anim_player_presets[] = { {0, "INTERNAL", 0, "Internal", "Built-in animation player"}, - {2, "DJV", 0, "Djv", "Open source frame player: http://djv.sourceforge.net"}, + {2, "DJV", 0, "DJV", "Open source frame player: http://djv.sourceforge.net"}, {3, "FRAMECYCLER", 0, "FrameCycler", "Frame player from IRIDAS"}, - {4, "RV", 0, "rv", "Frame player from Tweak Software"}, + {4, "RV", 0, "RV", "Frame player from Tweak Software"}, {5, "MPLAYER", 0, "MPlayer", "Media player for video & png/jpeg/sgi image sequences"}, {50, "CUSTOM", 0, "Custom", "Custom animation player executable path"}, {0, NULL, 0, NULL, NULL}, |