From 53b484d08106d5188e9323379bbe59f0ad702495 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 19 Feb 2019 09:42:06 +1100 Subject: DNA: rename select_color -> select_id The term color is misleading, it's an integer id that happens to be written to a color in some cases, then converted back to an integer. --- source/blender/draw/intern/draw_armature.c | 4 ++-- source/blender/draw/intern/draw_manager.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/draw/intern') diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index 26d53df2626..f22350113e7 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -1695,7 +1695,7 @@ static void draw_armature_edit(Object *ob) const bool show_text = DRW_state_show_text(); const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) == 0); - for (eBone = arm->edbo->first, index = ob->select_color; eBone; eBone = eBone->next, index += 0x10000) { + for (eBone = arm->edbo->first, index = ob->select_id; eBone; eBone = eBone->next, index += 0x10000) { if (eBone->layer & arm->layer) { if ((eBone->flag & BONE_HIDDEN_A) == 0) { const int select_id = is_select ? index : (uint)-1; @@ -1783,7 +1783,7 @@ static void draw_armature_pose(Object *ob, const float const_color[4]) } if (arm->flag & ARM_POSEMODE) { - index = ob->select_color; + index = ob->select_id; } } diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 77e96c99aee..e8a7d362d16 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2159,7 +2159,7 @@ void DRW_draw_select_loop( /* This relies on dupli instances being after their instancing object. */ if ((ob->base_flag & BASE_FROM_DUPLI) == 0) { Object *ob_orig = DEG_get_original_object(ob); - DRW_select_load_id(ob_orig->select_color); + DRW_select_load_id(ob_orig->select_id); } DST.dupli_parent = data_.dupli_parent; DST.dupli_source = data_.dupli_object_current; -- cgit v1.2.3