From fc10e89918cbd42a9d787801a896695c78ed7b34 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 19 Feb 2019 08:44:53 +1100 Subject: DNA: rename Object.col -> color Was confusing, unrelated to: colbits, col_mask, col_group, actcol & totcol. --- source/blender/draw/engines/workbench/workbench_deferred.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/draw/engines/workbench/workbench_deferred.c') diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c index d121dfb407d..f886b88828f 100644 --- a/source/blender/draw/engines/workbench/workbench_deferred.c +++ b/source/blender/draw/engines/workbench/workbench_deferred.c @@ -934,11 +934,11 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob) else if (ELEM(wpd->shading.color_type, V3D_SHADING_SINGLE_COLOR, V3D_SHADING_OBJECT_COLOR, V3D_SHADING_RANDOM_COLOR)) { - if ((ob->col[3] < 1.0f) && + if ((ob->color[3] < 1.0f) && (wpd->shading.color_type == V3D_SHADING_OBJECT_COLOR)) { /* Hack */ - wpd->shading.xray_alpha = ob->col[3]; + wpd->shading.xray_alpha = ob->color[3]; material = workbench_forward_get_or_create_material_data(vedata, ob, NULL, NULL, wpd->shading.color_type, 0); has_transp_mat = true; } -- cgit v1.2.3