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/makesdna/DNA_object_types.h | |
| parent | ecdd1864d16206eb45a6c95d9fcc0808a2c0087e (diff) | |
DNA: rename Object.col -> color
Was confusing, unrelated to:
colbits, col_mask, col_group, actcol & totcol.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 88461936bed..cf88d2591b2 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -321,8 +321,8 @@ typedef struct Object { /** Current face map, note: index starts at 1. */ unsigned short actfmap; char _pad2[2]; - /** Object color. */ - float col[4]; + /** Object color (in most cases the material color is used for drawing). */ + float color[4]; /** Softbody settings. */ short softflag; |