Commit: 05c727bb0062520152995932d99705d61227eeb6
Author: Sybren A. Stüvel
Date:   Fri Oct 14 18:45:49 2016 +0200
Branches: master
https://developer.blender.org/rB05c727bb0062520152995932d99705d61227eeb6

Prevent crash after OpenGL rendering animation to images.

===================================================================

M       source/blender/editors/render/render_opengl.c

===================================================================

diff --git a/source/blender/editors/render/render_opengl.c 
b/source/blender/editors/render/render_opengl.c
index 0716c06..9d9ccf2 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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to