griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #133800: View Render Animation leaves play buttons inactive

Browse Source 
The operator can get freed late if the window is out of focus. So finish
up everything already when the job ends.

Pull Request: https://projects.blender.org/blender/blender/pulls/133828
This commit is contained in:
Brecht Van Lommel
2025-01-30 17:18:46 +01:00
parent 40ac21e5a5
commit bbdd6419ac
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/render/render_opengl.cc
View File

@@ -141,6 +141,8 @@ struct OGLRender : public RenderJobBase {
std::condition_variable task_condition;
wmJob *wm_job = nullptr;
bool ended = false;
};
static bool screen_opengl_is_multiview(OGLRender *oglrender)
@@ -852,6 +854,11 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
static void screen_opengl_render_end(OGLRender *oglrender)
{
/* Ensure we don't call this both from the job and operator callbacks. */
if (oglrender->ended) {
return;
}
if (oglrender->task_pool) {
/* Trickery part for movie output:
*
@@ -909,6 +916,7 @@ static void screen_opengl_render_end(OGLRender *oglrender)
WM_main_add_notifier(NC_SCENE | ND_RENDER_RESULT, oglrender->scene);
G.is_rendering = false;
oglrender->ended = true;
}
static void screen_opengl_render_cancel(bContext *C, wmOperator *op)
@@ -1229,9 +1237,11 @@ static void opengl_render_startjob(void *customdata, wmJobWorkerStatus *worker_s
}
}
static void opengl_render_freejob(void * /*customdata*/)
static void opengl_render_freejob(void *customdata)
{
/* Freed by operator. */
/* End the render here, as the modal handler might be called with the window out of focus. */
OGLRender *oglrender = static_cast<OGLRender *>(customdata);
screen_opengl_render_end(oglrender);
}
static int screen_opengl_render_invoke(bContext *C, wmOperator *op, const wmEvent *event)