Merge branch 'blender-v3.2-release'

This commit is contained in:
Campbell Barton 2022-05-03 09:49:09 +10:00
commit e5a738af6d
Notes: blender-bot 2023-02-14 05:59:31 +01:00
Referenced by issue #101365, Regression: Can't save second Viewlayer as .exr
Referenced by issue #99732, Regression: Crash when opening the F3 menu in the dopesheet
2 changed files with 5 additions and 2 deletions

View File

@ -10,7 +10,7 @@ Notes:
- Temporary context overrides may be nested, when this is done, members will be added to the existing overrides.
- Context members are restored outside the scope of the context.
- Context members are restored outside the scope of the context-manager.
The only exception to this is when the data is no longer available.
In the event windowing data was removed (for example), the state of the context is left as-is.

View File

@ -14,6 +14,8 @@ def update_factory_startup_screens():
def update_factory_startup_ffmpeg_preset():
from bpy import context
preset = "H264_in_MP4"
preset_filepath = bpy.utils.preset_find(preset, preset_path="ffmpeg")
if not preset_filepath:
@ -24,7 +26,8 @@ def update_factory_startup_ffmpeg_preset():
render.image_settings.file_format = 'FFMPEG'
if preset_filepath:
bpy.ops.script.python_file_run({"scene": scene}, filepath=preset_filepath)
with context.temp_override(scene=scene):
bpy.ops.script.python_file_run(filepath=preset_filepath)
render.ffmpeg.audio_codec = 'AAC'
render.ffmpeg.audio_bitrate = 256