diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-11-08 20:13:59 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-11-08 20:13:59 +0300 |
| commit | e59ebfef3c583985553e78492cf8cd07bbe7648e (patch) | |
| tree | 35f31c3b592f40885baf8d8b078844c92bfbabe7 /source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc | |
| parent | fe7088c99ff084f7218ab20136d49eb1a1dccd0b (diff) | |
| parent | 4c182aef7ce0e8c26dd2b85c1fa2cd45c2ef64ea (diff) | |
Merge branch 'master' into temp-sculpt-brush-channeltemp-sculpt-brush-channel
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc index d1578b48c79..98771098f81 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc @@ -153,7 +153,7 @@ void register_node_type_sh_mix_rgb() sh_fn_node_type_base(&ntype, SH_NODE_MIX_RGB_LEGACY, "Mix (Legacy)", NODE_CLASS_OP_COLOR); ntype.declare = file_ns::sh_node_mix_rgb_declare; ntype.labelfunc = node_blend_label; - node_type_gpu(&ntype, file_ns::gpu_shader_mix_rgb); + ntype.gpu_fn = file_ns::gpu_shader_mix_rgb; ntype.build_multi_function = file_ns::sh_node_mix_rgb_build_multi_function; ntype.gather_link_search_ops = nullptr; nodeRegisterType(&ntype); |