diff options
author | Joseph Eagar <joeedh@gmail.com> | 2022-04-05 19:47:10 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2022-04-05 19:47:10 +0300 |
commit | 7748dd4ec735535f53f61d6aa4a2f6b9db9abdc1 (patch) | |
tree | 65f854f448a2503bef50781212355b74fa616839 /source/blender/draw/engines/overlay/overlay_metaball.c | |
parent | 9e12a731db6f6647d5e6dfdaa32fc4d8117a523d (diff) | |
parent | b84255f590c07b129f726eadbfec72c73bfc2ee1 (diff) |
Merge remote-tracking branch 'origin/master' into temp-sculpt-colorstemp-sculpt-colors
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_metaball.c')
-rw-r--r-- | source/blender/draw/engines/overlay/overlay_metaball.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_metaball.c b/source/blender/draw/engines/overlay/overlay_metaball.c index 7805b63993e..f024f5dfac8 100644 --- a/source/blender/draw/engines/overlay/overlay_metaball.c +++ b/source/blender/draw/engines/overlay/overlay_metaball.c @@ -60,10 +60,10 @@ void OVERLAY_edit_metaball_cache_populate(OVERLAY_Data *vedata, Object *ob) MetaBall *mb = ob->data; const float *color; - const float *col_radius = G_draw.block.colorMballRadius; - const float *col_radius_select = G_draw.block.colorMballRadiusSelect; - const float *col_stiffness = G_draw.block.colorMballStiffness; - const float *col_stiffness_select = G_draw.block.colorMballStiffnessSelect; + const float *col_radius = G_draw.block.color_mball_radius; + const float *col_radius_select = G_draw.block.color_mball_radius_select; + const float *col_stiffness = G_draw.block.color_mball_stiffness; + const float *col_stiffness_select = G_draw.block.color_mball_stiffness_select; int select_id = 0; if (is_select) { |