diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 07:52:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 07:52:59 +0300 |
commit | 2e2e6e3bdb694e56fcd161f06b6751e953cd2fa1 (patch) | |
tree | da178a4ab2c3993a90750afef65a51ee460465de /source/blender/nodes | |
parent | cc811d1fd63425e180ec50f7d13a0b9fe3a6e2eb (diff) |
Cleanup: Use BKE_colorband prefix
Diffstat (limited to 'source/blender/nodes')
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c index 32d68550cd4..707f1d22efd 100644 --- a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c +++ b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c @@ -46,7 +46,7 @@ static bNodeSocketTemplate cmp_node_valtorgb_out[] = { static void node_composit_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node) { - node->storage = add_colorband(true); + node->storage = BKE_colorband_add(true); } void register_node_type_cmp_valtorgb(void) diff --git a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c index 72942cce9c5..c960e006a9b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c +++ b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c @@ -53,14 +53,14 @@ static void node_shader_exec_valtorgb(void *UNUSED(data), int UNUSED(thread), bN float fac; nodestack_get_vec(&fac, SOCK_FLOAT, in[0]); - do_colorband(node->storage, fac, out[0]->vec); + BKE_colorband_evaluate(node->storage, fac, out[0]->vec); out[1]->vec[0] = out[0]->vec[3]; } } static void node_shader_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node) { - node->storage = add_colorband(true); + node->storage = BKE_colorband_add(true); } static int gpu_shader_valtorgb(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out) @@ -68,7 +68,7 @@ static int gpu_shader_valtorgb(GPUMaterial *mat, bNode *node, bNodeExecData *UNU float *array; int size; - colorband_table_RGBA(node->storage, &array, &size); + BKE_colorband_evaluate_table_rgba(node->storage, &array, &size); return GPU_stack_link(mat, "valtorgb", in, out, GPU_texture(size, array)); } diff --git a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c index a49d82d27a9..8b016c5aa50 100644 --- a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c +++ b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c @@ -49,7 +49,7 @@ static void valtorgb_colorfn(float *out, TexParams *p, bNode *node, bNodeStack * if (node->storage) { float fac = tex_input_value(in[0], p, thread); - do_colorband(node->storage, fac, out); + BKE_colorband_evaluate(node->storage, fac, out); } } @@ -60,7 +60,7 @@ static void valtorgb_exec(void *data, int UNUSED(thread), bNode *node, bNodeExec static void valtorgb_init(bNodeTree *UNUSED(ntree), bNode *node) { - node->storage = add_colorband(true); + node->storage = BKE_colorband_add(true); } void register_node_type_tex_valtorgb(void) |