diff options
| author | Weizhen Huang <itsnotrj@gmail.com> | 2022-11-11 18:17:58 +0300 |
|---|---|---|
| committer | Weizhen Huang <itsnotrj@gmail.com> | 2022-11-11 18:17:58 +0300 |
| commit | dad3574a8c0b673efa9d7f7c890d9562e3f6a267 (patch) | |
| tree | 84dff4a90c34a44744c329de21a999289f9d209a /source/blender/nodes/function/nodes/node_fn_combine_color.cc | |
| parent | e9260afa93068d0181de6e3223f65e7bb016aecc (diff) | |
| parent | dc8a1d38b73420428f9fb878386b99ebb69dd841 (diff) | |
Merge branch 'master' into soc-2022-many-lights-sampling
Diffstat (limited to 'source/blender/nodes/function/nodes/node_fn_combine_color.cc')
| -rw-r--r-- | source/blender/nodes/function/nodes/node_fn_combine_color.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/function/nodes/node_fn_combine_color.cc b/source/blender/nodes/function/nodes/node_fn_combine_color.cc index fddf606dfc9..c5dd5dfff1a 100644 --- a/source/blender/nodes/function/nodes/node_fn_combine_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_combine_color.cc @@ -97,8 +97,8 @@ void register_node_type_fn_combine_color(void) fn_node_type_base(&ntype, FN_NODE_COMBINE_COLOR, "Combine Color", NODE_CLASS_CONVERTER); ntype.declare = blender::nodes::fn_node_combine_color_declare; - node_type_update(&ntype, blender::nodes::fn_node_combine_color_update); - node_type_init(&ntype, blender::nodes::fn_node_combine_color_init); + ntype.updatefunc = blender::nodes::fn_node_combine_color_update; + ntype.initfunc = blender::nodes::fn_node_combine_color_init; node_type_storage( &ntype, "NodeCombSepColor", node_free_standard_storage, node_copy_standard_storage); ntype.build_multi_function = blender::nodes::fn_node_combine_color_build_multi_function; |