diff options
author | Luca Rood <dev@lucarood.com> | 2017-06-19 17:31:10 +0300 |
---|---|---|
committer | Luca Rood <dev@lucarood.com> | 2017-06-20 19:39:49 +0300 |
commit | aaf37e1216b2a9dfc43591e227c679a5b35af8c0 (patch) | |
tree | ca02bf03d24e919ca55c5475eb98deda91804543 /source/blender/nodes/NOD_static_types.h | |
parent | c2f4308e6ba21d4bcbed0aa36b6c770967160771 (diff) |
Implement Eevee output node system
This makes Eevee consistent with Cycles, by having a single output node,
and multiple shader nodes that connect to it.
Note that node systems for Eevee saved before this will be missing the
output node, and thus will show an invalid material. This is easily
resolved by connecting the shader output to a new output node.
Diffstat (limited to 'source/blender/nodes/NOD_static_types.h')
-rw-r--r-- | source/blender/nodes/NOD_static_types.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index f4c79266033..c4c99fdb256 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -67,8 +67,9 @@ DefNode( ShaderNode, SH_NODE_COMBRGB, 0, "COMBR DefNode( ShaderNode, SH_NODE_HUE_SAT, 0, "HUE_SAT", HueSaturation, "Hue/Saturation", "" ) DefNode( ShaderNode, SH_NODE_OUTPUT_MATERIAL, def_sh_output, "OUTPUT_MATERIAL", OutputMaterial, "Material Output", "" ) -DefNode( ShaderNode, SH_NODE_OUTPUT_METALLIC, def_sh_output, "OUTPUT_METALLIC", OutputMetallic, "Material Metallic Output", "") -DefNode( ShaderNode, SH_NODE_OUTPUT_SPECULAR, def_sh_output, "OUTPUT_SPECULAR", OutputSpecular, "Material Specular Output", "") +DefNode( ShaderNode, SH_NODE_OUTPUT_METALLIC, 0, "OUTPUT_METALLIC", OutputMetallic, "Material Metallic Output", "") +DefNode( ShaderNode, SH_NODE_OUTPUT_SPECULAR, 0, "OUTPUT_SPECULAR", OutputSpecular, "Material Specular Output", "") +DefNode( ShaderNode, SH_NODE_OUTPUT_EEVEE_MATERIAL, def_sh_output, "OUTPUT_EEVEE_MATERIAL", OutputEeveeMaterial, "Eevee Material Output", "") DefNode( ShaderNode, SH_NODE_OUTPUT_LAMP, def_sh_output, "OUTPUT_LAMP", OutputLamp, "Lamp Output", "" ) DefNode( ShaderNode, SH_NODE_OUTPUT_WORLD, def_sh_output, "OUTPUT_WORLD", OutputWorld, "World Output", "" ) DefNode( ShaderNode, SH_NODE_OUTPUT_LINESTYLE, def_sh_output_linestyle,"OUTPUT_LINESTYLE", OutputLineStyle, "Line Style Output", "" ) |