[Bf-blender-cvs] [b51dcb6f07f] blender2.8: Fix crash w/ missing matcaps

[Campbell Barton]

Commit: b51dcb6f07f34c904b036887e24f96542d9fb76d
Author: Campbell Barton
Date:   Tue Jul 31 16:44:35 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBb51dcb6f07f34c904b036887e24f96542d9fb76d

Fix crash w/ missing matcaps

Building w/o EXR caused this.

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

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 2b716b8ffe3..49cdab256f0 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -42,6 +42,13 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
 		wpd->studio_light = BKE_studiolight_find(
 		        wpd->shading.studio_light, STUDIOLIGHT_ORIENTATION_CAMERA | STUDIOLIGHT_ORIENTATION_WORLD);
 	}
+
+	/* If matcaps are missing, use this as fallback. */
+	if (UNLIKELY(wpd->studio_light == NULL)) {
+		wpd->studio_light = BKE_studiolight_find(
+		        wpd->shading.studio_light, STUDIOLIGHT_ORIENTATION_CAMERA | STUDIOLIGHT_ORIENTATION_WORLD);
+	}
+
 	wpd->shadow_multiplier = 1.0 - wpd->shading.shadow_intensity;
 
 	WORKBENCH_UBO_World *wd = &wpd->world_data;