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_materials.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_materials.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_materials.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index 3f0f119a106..921585122dd 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -63,7 +63,7 @@ void workbench_material_update_data(WORKBENCH_PrivateData *wpd, Object *ob, Mate copy_v3_v3(data->base_color, data->diffuse_color); } else if (color_type == V3D_SHADING_OBJECT_COLOR) { - copy_v3_v3(data->diffuse_color, ob->col); + copy_v3_v3(data->diffuse_color, ob->color); copy_v3_v3(data->base_color, data->diffuse_color); } else { |