archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-12-07 23:53:03 +11:00
parent 46f518e927 2e2e6e3bdb
commit 1c7cfa025c
46 changed files with 591 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/intern/draw_cache_impl_lattice.c
View File

@@ -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);