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/makesdna/DNA_object_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/makesdna/DNA_object_types.h') 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; -- cgit v1.2.3