diff options
author | Juho Vepsalainen <bebraw@gmail.com> | 2007-08-20 15:05:14 +0400 |
---|---|---|
committer | Juho Vepsalainen <bebraw@gmail.com> | 2007-08-20 15:05:14 +0400 |
commit | c3b1877b4f538d68697b56035823fe08572c080d (patch) | |
tree | 9ebfff2dcf43f4a91d0a763d668ce65525bda8ef /source/blender | |
parent | e8c39a5864a400971891932a8580d7e0784c334d (diff) |
"Combine RGB" and "Separate RGB" material nodes:
These nodes allow the user to separate and combine RGB color channels
as in the composite node editor. However they don't contain Alpha
channel as it is treated separately in case of material nodes.
"Combine RGB" allows the user to use values beyond standard float range
([0.0, 1.0]) if value input node is used to feed the value to it.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/SHD_node.h | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 5e5377c8969..3623b5c2605 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -206,6 +206,8 @@ struct ShadeResult; #define SH_NODE_SQUEEZE 117 #define SH_NODE_MATERIAL_EXT 118 #define SH_NODE_INVERT 119 +#define SH_NODE_SEPRGB 120 +#define SH_NODE_COMBRGB 121 /* custom defines options for Material node */ diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index b140993a55b..0ce3e634a62 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2389,6 +2389,8 @@ static void registerShaderNodes(ListBase *ntypelist) nodeRegisterType(ntypelist, &sh_node_rgb); nodeRegisterType(ntypelist, &sh_node_texture); nodeRegisterType(ntypelist, &sh_node_invert); + nodeRegisterType(ntypelist, &sh_node_seprgb); + nodeRegisterType(ntypelist, &sh_node_combrgb); } void init_nodesystem(void) diff --git a/source/blender/nodes/SHD_node.h b/source/blender/nodes/SHD_node.h index 688494d6de5..971ddbe7f06 100644 --- a/source/blender/nodes/SHD_node.h +++ b/source/blender/nodes/SHD_node.h @@ -58,6 +58,9 @@ extern bNodeType sh_node_vect_math; extern bNodeType sh_node_squeeze; extern bNodeType sh_node_material_ext; extern bNodeType sh_node_invert; +extern bNodeType sh_node_seprgb; +extern bNodeType sh_node_combrgb; + #endif |