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 | |
parent | 46f518e92790a04885f4e047bb59b11019d73aa3 (diff) | |
parent | 2e2e6e3bdb694e56fcd161f06b6751e953cd2fa1 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_lattice.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 6 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_common.c | 4 |
3 files changed, 7 insertions, 7 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); diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 8cd0c13faec..54021e398c9 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -48,7 +48,7 @@ #include "BKE_editmesh_tangent.h" #include "BKE_mesh.h" #include "BKE_mesh_tangent.h" -#include "BKE_texture.h" +#include "BKE_colorband.h" #include "bmesh.h" @@ -1097,7 +1097,7 @@ static void mesh_render_data_ensure_vert_weight_color(MeshRenderData *rdata, con const MDeformVert *dvert = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); float weight = defvert_find_weight(dvert, defgroup); if (U.flag & USER_CUSTOM_RANGE) { - do_colorband(&U.coba_weight, weight, vweight[i]); + BKE_colorband_evaluate(&U.coba_weight, weight, vweight[i]); } else { rgb_from_weight(vweight[i], weight); @@ -1113,7 +1113,7 @@ static void mesh_render_data_ensure_vert_weight_color(MeshRenderData *rdata, con for (int i = 0; i < rdata->vert_len; i++) { float weight = defvert_find_weight(&rdata->dvert[i], defgroup); if (U.flag & USER_CUSTOM_RANGE) { - do_colorband(&U.coba_weight, weight, vweight[i]); + BKE_colorband_evaluate(&U.coba_weight, weight, vweight[i]); } else { rgb_from_weight(vweight[i], weight); diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index b52c8e280b3..f24d7d13771 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -31,7 +31,7 @@ #include "UI_resources.h" #include "BKE_global.h" -#include "BKE_texture.h" +#include "BKE_colorband.h" #include "draw_common.h" @@ -130,7 +130,7 @@ void DRW_globals_update(void) ramp.data[2].r = 1.0f; ramp.data[2].pos = 1.0f; - colorband_table_RGBA(&ramp, &colors, &col_size); + BKE_colorband_evaluate_table_rgba(&ramp, &colors, &col_size); if (globals_ramp) { GPU_texture_free(globals_ramp); |