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:
Diffstat (limited to 'release/scripts/startup/bl_operators/screen_play_rendered_anim.py')
-rw-r--r--release/scripts/startup/bl_operators/screen_play_rendered_anim.py34
1 files changed, 10 insertions, 24 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 3900fc3f2c2..255852d3b26 100644
--- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
+++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
@@ -32,25 +32,11 @@ def guess_player_path(preset):
if preset == 'INTERNAL':
return bpy.app.binary_path
- elif preset == 'BLENDER24':
- player_path = "blender"
-
- if sys.platform == "darwin":
- test_path = "/Applications/blender 2.49.app/Contents/MacOS/blender"
- elif sys.platform[:3] == "win":
- test_path = "/Program Files/Blender Foundation/Blender/blender.exe"
-
- if os.path.exists(test_path):
- player_path = test_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
@@ -148,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}"]
@@ -175,14 +167,8 @@ class PlayRenderedAnim(Operator):
# launch it
print("Executing command:\n ", " ".join(quote(c) for c in cmd))
- # workaround for boost 1.46, can be eventually removed. bug: [#32350]
- env_copy = os.environ.copy()
- if preset == 'INTERNAL':
- env_copy["LC_ALL"] = "C"
- # end workaround
-
try:
- subprocess.Popen(cmd, env=env_copy)
+ subprocess.Popen(cmd)
except Exception as e:
err_msg = tip_("Couldn't run external animation player with command %r\n%s") % (cmd, e)
self.report(