Merge branch 'blender-v3.1-release'
This commit is contained in:
commit
cf6546863e
@ -58,6 +58,12 @@ class PlayRenderedAnim(Operator):
|
||||
# file_path = bpy.path.abspath(rd.filepath) # UNUSED
|
||||
is_movie = rd.is_movie_format
|
||||
|
||||
views_format = rd.image_settings.views_format
|
||||
if rd.use_multiview and views_format == 'INDIVIDUAL':
|
||||
view_suffix = rd.views.active.file_suffix
|
||||
else:
|
||||
view_suffix = ""
|
||||
|
||||
# try and guess a command line if it doesn't exist
|
||||
if preset == 'CUSTOM':
|
||||
player_path = prefs.filepaths.animation_player
|
||||
@ -66,16 +72,16 @@ class PlayRenderedAnim(Operator):
|
||||
|
||||
if is_movie is False and preset in {'FRAMECYCLER', 'RV', 'MPLAYER'}:
|
||||
# replace the number with '#'
|
||||
file_a = rd.frame_path(frame=0)
|
||||
file_a = rd.frame_path(frame=0, view=view_suffix)
|
||||
|
||||
# TODO, make an api call for this
|
||||
frame_tmp = 9
|
||||
file_b = rd.frame_path(frame=frame_tmp)
|
||||
file_b = rd.frame_path(frame=frame_tmp, view=view_suffix)
|
||||
|
||||
while len(file_a) == len(file_b):
|
||||
frame_tmp = (frame_tmp * 10) + 9
|
||||
file_b = rd.frame_path(frame=frame_tmp)
|
||||
file_b = rd.frame_path(frame=int(frame_tmp / 10))
|
||||
file_b = rd.frame_path(frame=frame_tmp, view=view_suffix)
|
||||
file_b = rd.frame_path(frame=int(frame_tmp / 10), view=view_suffix)
|
||||
|
||||
file = ("".join((c if file_b[i] == c else "#")
|
||||
for i, c in enumerate(file_a)))
|
||||
@ -84,7 +90,7 @@ class PlayRenderedAnim(Operator):
|
||||
else:
|
||||
path_valid = True
|
||||
# works for movies and images
|
||||
file = rd.frame_path(frame=scene.frame_start, preview=scene.use_preview_range)
|
||||
file = rd.frame_path(frame=scene.frame_start, preview=scene.use_preview_range, view=view_suffix)
|
||||
file = bpy.path.abspath(file) # expand '//'
|
||||
if not os.path.exists(file):
|
||||
err_msg = tip_("File %r not found") % file
|
||||
@ -93,7 +99,7 @@ class PlayRenderedAnim(Operator):
|
||||
|
||||
# one last try for full range if we used preview range
|
||||
if scene.use_preview_range and not path_valid:
|
||||
file = rd.frame_path(frame=scene.frame_start, preview=False)
|
||||
file = rd.frame_path(frame=scene.frame_start, preview=False, view=view_suffix)
|
||||
file = bpy.path.abspath(file) # expand '//'
|
||||
err_msg = tip_("File %r not found") % file
|
||||
if not os.path.exists(file):
|
||||
|
Loading…
Reference in New Issue
Block a user