Merge branch 'blender-v4.0-release'

This commit is contained in:
Brecht Van Lommel
2023-10-26 15:51:19 +02:00

View File

@@ -665,6 +665,8 @@ static void playanim_toscreen_ex(GHOST_WindowHandle ghost_window,
const float frame_indicator_factor)
{
GHOST_ActivateWindowDrawingContext(ghost_window);
GPU_render_begin();
GPU_render_step();
GPU_clear_color(0.1f, 0.1f, 0.1f, 0.0f);
@@ -768,6 +770,7 @@ static void playanim_toscreen_ex(GHOST_WindowHandle ghost_window,
}
GHOST_SwapWindowBuffers(ghost_window);
GPU_render_end();
}
static void playanim_toscreen_on_load(GHOST_WindowHandle ghost_window,
@@ -1861,6 +1864,8 @@ static bool wm_main_playanim_intern(int argc, const char **argv, PlayArgs *args_
ps.display_ctx.size[0] = ps.ibuf_size[0];
ps.display_ctx.size[1] = ps.ibuf_size[1];
GPU_render_begin();
GPU_render_step();
GPU_clear_color(0.1f, 0.1f, 0.1f, 0.0f);
{
@@ -1872,6 +1877,7 @@ static bool wm_main_playanim_intern(int argc, const char **argv, PlayArgs *args_
}
GHOST_SwapWindowBuffers(ps.ghost_data.window);
GPU_render_end();
/* One of the frames was invalid or not passed in. */
if (frame_start == -1 || frame_end == -1) {