[Bf-blender-cvs] [d97df138d1a] master: Fix T60908: crash in workbench render after DoF changes.

[Brecht Van Lommel]

Commit: d97df138d1ab965a39973366810952979d164665
Author: Brecht Van Lommel
Date:   Sun Jan 27 13:52:28 2019 +0100
Branches: master
https://developer.blender.org/rBd97df138d1ab965a39973366810952979d164665

Fix T60908: crash in workbench render after DoF changes.

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

M       source/blender/draw/engines/workbench/workbench_deferred.c

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

diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c 
b/source/blender/draw/engines/workbench/workbench_deferred.c
index e6771ddc562..0e8981ed4a1 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -342,7 +342,15 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
        const DRWContextState *draw_ctx = DRW_context_state_get();
        RegionView3D *rv3d = draw_ctx->rv3d;
        View3D *v3d = draw_ctx->v3d;
-       Object *camera = (rv3d->persp == RV3D_CAMOB) ? v3d->camera : NULL;
+       Scene *scene = draw_ctx->scene;
+       Object *camera;
+
+       if (v3d && rv3d) {
+               camera = (rv3d->persp == RV3D_CAMOB) ? v3d->camera : NULL;
+       }
+       else {
+               camera = scene->camera;
+       }
 
        if (!stl->g_data) {
                /* Alloc transient pointers */
@@ -473,7 +481,6 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
        }
 
        {
-               Scene *scene = draw_ctx->scene;
                /* AO Samples Tex */
                int num_iterations = 
workbench_taa_calculate_num_iterations(vedata);
 
@@ -497,7 +504,7 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
        /* Prepass */
        {
                DRWShadingGroup *grp;
-               const bool do_cull = (draw_ctx->v3d && 
(draw_ctx->v3d->shading.flag & V3D_SHADING_BACKFACE_CULLING));
+               const bool do_cull = (v3d && (v3d->shading.flag & 
V3D_SHADING_BACKFACE_CULLING));
 
                int state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | 
DRW_STATE_DEPTH_LESS_EQUAL;
                psl->prepass_pass = DRW_pass_create("Prepass", (do_cull) ? 
state | DRW_STATE_CULL_BACK : state);

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