diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-01-20 19:32:16 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-01-20 19:32:23 +0300 |
| commit | 31e2786707049c40b9d8639639fd16a5cc0dce13 (patch) | |
| tree | 2a5e4074763857a01aad011ef964a76242f0d07c /release | |
| parent | 661d363e13ff3c86b30d09333e5334146e5da79f (diff) | |
Fix T71825: Custom Animation Player path overrides chosen player
Thanks @mano-wii for providing the patch!
The original code assumed that when `animation_player_preset` was not
`CUSTOM`, the `animation_player` path would be empty. This is a bad
assumption, as it can be quite useful to be able to toggle between a custom
and a built-in player. As such, `animation_player` should not be reset to
an empty string when a non-custom player is chosen.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/screen_play_rendered_anim.py | 5 |
1 files changed, 3 insertions, 2 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 756d2ff1eeb..3900fc3f2c2 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -85,12 +85,13 @@ class PlayRenderedAnim(Operator): fps_final = rd.fps / rd.fps_base preset = prefs.filepaths.animation_player_preset - player_path = prefs.filepaths.animation_player # file_path = bpy.path.abspath(rd.filepath) # UNUSED is_movie = rd.is_movie_format # try and guess a command line if it doesn't exist - if player_path == "": + if preset == 'CUSTOM': + player_path = prefs.filepaths.animation_player + else: player_path = guess_player_path(preset) if is_movie is False and preset in {'FRAMECYCLER', 'RV', 'MPLAYER'}: |