archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix workbench render crash in background mode

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-07-02 16:07:58 +02:00
parent 87c39f1123
commit 2062d649bf
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/draw/engines/workbench/workbench_data.c
View File

@@ -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);