diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-06 20:07:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-06 20:07:11 +0400 |
commit | db6c4ba11ec3dbfc1711cdb1870629655e8ea8ee (patch) | |
tree | 38d433fac42465ca7cbb1551b6af0eae98747327 /release | |
parent | 48b59330fe48f9e0546b2179dd2e0a6d9e6b6840 (diff) |
bring back the play option from 2.4x
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/screen_play_rendered_anim.py | 31 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 1 |
2 files changed, 5 insertions, 27 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 9cb9dfc708c..b4733ac9d87 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -28,7 +28,9 @@ import os def guess_player_path(preset): import sys - if preset == 'BLENDER24': + if preset == 'INTERNAL': + return bpy.app.binary_path + elif preset == 'BLENDER24': player_path = "blender" if sys.platform == "darwin": @@ -110,32 +112,7 @@ class PlayRenderedAnim(Operator): cmd = [player_path] # extra options, fps controls etc. - if preset == 'BLENDER24': - # ----------------------------------------------------------------- - # Check blender is not 2.5x until it supports playback again - try: - process = subprocess.Popen([player_path, '--version'], - stdout=subprocess.PIPE, - ) - except: - # ignore and allow the main execution to catch the problem. - process = None - - if process is not None: - process.wait() - out = process.stdout.read() - process.stdout.close() - out_split = out.strip().split() - if out_split[0] == b'Blender': - if not out_split[1].startswith(b'2.4'): - self.report({'ERROR'}, - "Blender %s doesn't support playback: %r" % - (out_split[1].decode(), player_path)) - return {'CANCELLED'} - del out, out_split - del process - # ----------------------------------------------------------------- - + if preset in {'BLENDER24', 'INTERNAL'}: opts = ["-a", "-f", str(rd.fps), str(rd.fps_base), "-j", str(scene.frame_step), file] cmd.extend(opts) diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 1ed3638080a..74bb720b618 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -66,6 +66,7 @@ class RENDER_PT_render(RenderButtonsPanel, Panel): row = layout.row() row.operator("render.render", text="Image", icon='RENDER_STILL') row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True + row.operator("render.play_rendered_anim", text="Play", icon='RENDER_ANIMATION') layout.prop(rd, "display_mode", text="Display") |