Commit: bc74e48680134ff195d6e76ac58b3c19e31b2803
Author: Clément Foucault
Date: Fri Dec 14 20:03:18 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBbc74e48680134ff195d6e76ac58b3c19e31b2803
Fix T59373: Background Colors don't match in Workbench renderer
===================================================================
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 04e760f1909..ab9417705e5 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -55,13 +55,14 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
wd->matcap_orientation = (wpd->shading.flag &
V3D_SHADING_MATCAP_FLIP_X) != 0;
wd->background_alpha = (DRW_state_is_image_render() &&
scene->r.alphamode == R_ALPHAPREMUL) ? 0.0f : 1.0f;
- if (!v3d || ((v3d->shading.background_type ==
V3D_SHADING_BACKGROUND_WORLD) &&
- (scene->world != NULL)))
+ if ((scene->world != NULL) &&
+ (!v3d || (v3d && ((v3d->shading.background_type ==
V3D_SHADING_BACKGROUND_WORLD) ||
+ (v3d->shading.type == OB_RENDER)))))
{
copy_v3_v3(wd->background_color_low, &scene->world->horr);
copy_v3_v3(wd->background_color_high, &scene->world->horr);
}
- else if (v3d->shading.background_type ==
V3D_SHADING_BACKGROUND_VIEWPORT) {
+ else if (v3d && (v3d->shading.background_type ==
V3D_SHADING_BACKGROUND_VIEWPORT)) {
copy_v3_v3(wd->background_color_low,
v3d->shading.background_color);
copy_v3_v3(wd->background_color_high,
v3d->shading.background_color);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
