diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2016-10-14 19:45:49 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2016-10-14 19:46:28 +0300 |
| commit | 05c727bb0062520152995932d99705d61227eeb6 (patch) | |
| tree | a69ea4a6d86e62b9cfaa7d2ec10f847237f4c34a | |
| parent | 8e80d2741deaa919a62e6e1677c0520332792698 (diff) | |
Prevent crash after OpenGL rendering animation to images.
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 0716c062ab9..9d9ccf2f3ba 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -739,7 +739,10 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender) if (oglrender->is_animation) { BLI_task_pool_work_and_wait(oglrender->task_pool); BLI_task_pool_free(oglrender->task_pool); - BLI_task_scheduler_free(oglrender->task_scheduler); + /* Depending on various things we might or might not use global scheduler. */ + if (oglrender->task_scheduler != NULL) { + BLI_task_scheduler_free(oglrender->task_scheduler); + } BLI_spin_end(&oglrender->reports_lock); } BLI_mutex_end(&oglrender->task_mutex); |