diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 15:53:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 15:53:03 +0300 |
| commit | 1c7cfa025c87e8f31790b48cbb189949f7949ad1 (patch) | |
| tree | 3869d475a9d10c005b0bb8006eb77bf55f1903d3 /source/blender/draw/intern/draw_cache_impl_lattice.c | |
| parent | 46f518e92790a04885f4e047bb59b11019d73aa3 (diff) | |
| parent | 2e2e6e3bdb694e56fcd161f06b6751e953cd2fa1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_lattice.c')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_lattice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_lattice.c b/source/blender/draw/intern/draw_cache_impl_lattice.c index 20698fe6592..eed408de3cd 100644 --- a/source/blender/draw/intern/draw_cache_impl_lattice.c +++ b/source/blender/draw/intern/draw_cache_impl_lattice.c @@ -41,7 +41,7 @@ #include "BKE_lattice.h" #include "BKE_deform.h" -#include "BKE_texture.h" +#include "BKE_colorband.h" #include "GPU_batch.h" @@ -260,7 +260,7 @@ static void lattice_render_data_weight_col_get(const LatticeRenderData *rdata, c float weight = defvert_find_weight(rdata->dvert + vert_idx, actdef); if (U.flag & USER_CUSTOM_RANGE) { - do_colorband(&U.coba_weight, weight, r_col); + BKE_colorband_evaluate(&U.coba_weight, weight, r_col); } else { rgb_from_weight(r_col, weight); |