diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2022-10-24 20:33:11 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2022-10-24 20:33:11 +0300 |
| commit | a41a1bfc494e4015406549e137114ef5a450aaf0 (patch) | |
| tree | dbdc95584f91aded4b777bac30074f9f78d8c89c /source/blender/nodes/texture/nodes/node_texture_compose.c | |
| parent | fc8f9e420426570dcb3e026ecbe8145cd0fae5ca (diff) | |
| parent | 53795877727d67185de858a480c8090ca7eb8e36 (diff) | |
Merge branch 'master' into bevelv2
Diffstat (limited to 'source/blender/nodes/texture/nodes/node_texture_compose.c')
| -rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_compose.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/nodes/texture/nodes/node_texture_compose.c b/source/blender/nodes/texture/nodes/node_texture_compose.c index ef14062c72d..e36bc248ed1 100644 --- a/source/blender/nodes/texture/nodes/node_texture_compose.c +++ b/source/blender/nodes/texture/nodes/node_texture_compose.c @@ -42,7 +42,8 @@ void register_node_type_tex_compose(void) { static bNodeType ntype; - tex_node_type_base(&ntype, TEX_NODE_COMPOSE_LEGACY, "Combine RGBA", NODE_CLASS_OP_COLOR); + tex_node_type_base( + &ntype, TEX_NODE_COMPOSE_LEGACY, "Combine RGBA (Legacy)", NODE_CLASS_OP_COLOR); node_type_socket_templates(&ntype, inputs, outputs); node_type_exec(&ntype, NULL, NULL, exec); |