Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-19 00:44:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-19 00:48:15 +0300
commitfc10e89918cbd42a9d787801a896695c78ed7b34 (patch)
tree63baa3e5c98c8845e3d263f0c74d95184672d5b9 /source/blender/blenkernel
parentecdd1864d16206eb45a6c95d9fcc0808a2c0087e (diff)
DNA: rename Object.col -> color
Was confusing, unrelated to: colbits, col_mask, col_group, actcol & totcol.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/object.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index b9c9cf49d92..ccb5f0d0b02 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -810,8 +810,7 @@ void BKE_object_init(Object *ob)
{
/* BLI_assert(MEMCMP_STRUCT_OFS_IS_ZERO(ob, id)); */ /* ob->type is already initialized... */
- ob->col[0] = ob->col[1] = ob->col[2] = 1.0;
- ob->col[3] = 1.0;
+ copy_v4_fl(ob->color, 1.0f);
ob->scale[0] = ob->scale[1] = ob->scale[2] = 1.0;
ob->dscale[0] = ob->dscale[1] = ob->dscale[2] = 1.0;