diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-19 00:44:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-19 00:48:15 +0300 |
| commit | fc10e89918cbd42a9d787801a896695c78ed7b34 (patch) | |
| tree | 63baa3e5c98c8845e3d263f0c74d95184672d5b9 /source/blender/draw/engines/workbench/workbench_deferred.c | |
| parent | ecdd1864d16206eb45a6c95d9fcc0808a2c0087e (diff) | |
DNA: rename Object.col -> color
Was confusing, unrelated to:
colbits, col_mask, col_group, actcol & totcol.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_deferred.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_deferred.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |