diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 09:44:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 09:44:35 +0300 |
| commit | b51dcb6f07f34c904b036887e24f96542d9fb76d (patch) | |
| tree | 8416855f4c419fa45756b5b75229cc7ed72ad43c /source/blender/draw/engines/workbench/workbench_data.c | |
| parent | 65344a6d1980082383993eaebf94b5647834c55c (diff) | |
Fix crash w/ missing matcaps
Building w/o EXR caused this.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_data.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_data.c | 7 |
1 files changed, 7 insertions, 0 deletions
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; |