diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-27 15:52:28 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-27 15:55:18 +0300 |
| commit | d97df138d1ab965a39973366810952979d164665 (patch) | |
| tree | 10e01b336fda1015a0c9a8fef77e49c8de3e816f /source/blender/draw/engines/workbench/workbench_deferred.c | |
| parent | f17afe69a3b103cf9e8fb3c3f9c349ee8c1d7f3b (diff) | |
Fix T60908: crash in workbench render after DoF changes.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_deferred.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_deferred.c | 13 |
1 files changed, 10 insertions, 3 deletions
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); |