diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-02 17:07:58 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-02 19:09:01 +0300 |
commit | 2062d649bf866331d27f00322008049594e9db35 (patch) | |
tree | 70e3dafcc70505f2bed1b2d2d534c4a99eb1387f /source/blender/draw | |
parent | 87c39f11231b165ce913673676f57d6a013c23c4 (diff) |
Fix workbench render crash in background mode
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_data.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index 4b4bd74ae76..743a1fc42b6 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -45,19 +45,16 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) wpd->preferences = &U; View3D *v3d = draw_ctx->v3d; - if (!v3d) { - wpd->shading = scene->display.shading; - wpd->use_color_render_settings = true; - } - else if (v3d->shading.type == OB_RENDER && BKE_scene_uses_blender_workbench(scene)) { + if (!v3d || (v3d->shading.type == OB_RENDER && BKE_scene_uses_blender_workbench(scene))) { wpd->shading = scene->display.shading; + wpd->shading.xray_alpha = XRAY_ALPHA((&scene->display)); wpd->use_color_render_settings = true; } else { wpd->shading = v3d->shading; + wpd->shading.xray_alpha = XRAY_ALPHA(v3d); wpd->use_color_render_settings = false; } - wpd->shading.xray_alpha = XRAY_ALPHA(v3d); wpd->use_color_management = BKE_scene_check_color_management_enabled(scene); |