[Bf-blender-cvs] [185c2487a68] master: Fix T60737: Crash workbench rendering

Campbell Barton noreply at git.blender.org
Tue Jan 22 12:27:50 CET 2019


Commit: 185c2487a68125a309f3c4265419cefe163d4bdb
Author: Campbell Barton
Date:   Tue Jan 22 22:27:23 2019 +1100
Branches: master
https://developer.blender.org/rB185c2487a68125a309f3c4265419cefe163d4bdb

Fix T60737: Crash workbench rendering

Addition of clipping from 7467049055a7
didn't account for non viewport display.

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

M	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;



More information about the Bf-blender-cvs mailing list