From 185c2487a68125a309f3c4265419cefe163d4bdb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 22 Jan 2019 22:27:23 +1100 Subject: Fix T60737: Crash workbench rendering Addition of clipping from 7467049055a7 didn't account for non viewport display. --- source/blender/draw/engines/workbench/workbench_data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/draw/engines/workbench/workbench_data.c') diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index 38787210036..f557a3fcccd 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -88,7 +88,8 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) wd->curvature_ridge = 0.5f / max_ff(SQUARE(wpd->shading.curvature_ridge_factor), 1e-4f); wd->curvature_valley = 0.7f / max_ff(SQUARE(wpd->shading.curvature_valley_factor), 1e-4f); - { + /* Will be NULL when rendering. */ + if (draw_ctx->rv3d != NULL) { RegionView3D *rv3d = draw_ctx->rv3d; if (rv3d->rflag & RV3D_CLIPPING) { wpd->world_clip_planes = rv3d->clip; -- cgit v1.2.3