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 01:42:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-19 01:45:48 +0300
commit53b484d08106d5188e9323379bbe59f0ad702495 (patch)
treed6fcebafacc9c60aebb7bd07684e39ba82c92310 /source/blender/draw/modes/edit_metaball_mode.c
parentfc10e89918cbd42a9d787801a896695c78ed7b34 (diff)
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.
Diffstat (limited to 'source/blender/draw/modes/edit_metaball_mode.c')
-rw-r--r--source/blender/draw/modes/edit_metaball_mode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c
index cfeeb973ddf..72d8b4b86f8 100644
--- a/source/blender/draw/modes/edit_metaball_mode.c
+++ b/source/blender/draw/modes/edit_metaball_mode.c
@@ -162,8 +162,8 @@ static void EDIT_METABALL_cache_populate(void *vedata, Object *ob)
copy_v3_v3(draw_scale_xform[2], scamat[2]);
}
- int selection_id = ob->select_color;
- for (MetaElem *ml = mb->editelems->first; ml != NULL; ml = ml->next, selection_id += 0x10000) {
+ int select_id = ob->select_id;
+ for (MetaElem *ml = mb->editelems->first; ml != NULL; ml = ml->next, select_id += 0x10000) {
float world_pos[3];
mul_v3_m4v3(world_pos, ob->obmat, &ml->x);
draw_scale_xform[0][3] = world_pos[0];
@@ -176,7 +176,7 @@ static void EDIT_METABALL_cache_populate(void *vedata, Object *ob)
else color = col_radius;
if (is_select) {
- DRW_select_load_id(selection_id | MBALLSEL_RADIUS);
+ DRW_select_load_id(select_id | MBALLSEL_RADIUS);
}
DRW_shgroup_call_dynamic_add(group, draw_scale_xform, &ml->rad, color);
@@ -185,7 +185,7 @@ static void EDIT_METABALL_cache_populate(void *vedata, Object *ob)
else color = col_stiffness;
if (is_select) {
- DRW_select_load_id(selection_id | MBALLSEL_STIFF);
+ DRW_select_load_id(select_id | MBALLSEL_STIFF);
}
DRW_shgroup_call_dynamic_add(group, draw_scale_xform, &draw_stiffness_radius, color);