diff options
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 12 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree_types.h | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 5eabbe72373..e56d848f29f 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -164,8 +164,8 @@ static StructRNA *rna_NodeSocketType_refine(struct PointerRNA *ptr) return &RNA_VectorNodeSocket; case SOCK_RGBA: return &RNA_RGBANodeSocket; - case SOCK_CLOSURE: - return &RNA_ClosureNodeSocket; + case SOCK_SHADER: + return &RNA_ShaderNodeSocket; default: return &RNA_NodeSocket; } @@ -2979,12 +2979,12 @@ static void rna_def_node_socket_rgba(BlenderRNA *brna) RNA_def_property_float_funcs(prop, NULL, NULL, "rna_NodeSocket_defvalue_range"); } -static void rna_def_node_socket_closure(BlenderRNA *brna) +static void rna_def_node_socket_shader(BlenderRNA *brna) { StructRNA *srna; - srna = RNA_def_struct(brna, "ClosureNodeSocket", "NodeSocket"); - RNA_def_struct_ui_text(srna, "Closure Node Socket", "Input or output socket of a node"); + srna = RNA_def_struct(brna, "ShaderNodeSocket", "NodeSocket"); + RNA_def_struct_ui_text(srna, "Shader Node Socket", "Input or output socket of a node"); RNA_def_struct_sdna(srna, "bNodeSocket"); RNA_def_struct_ui_icon(srna, ICON_PLUG); RNA_def_struct_path_func(srna, "rna_NodeSocket_path"); @@ -3224,7 +3224,7 @@ void RNA_def_nodetree(BlenderRNA *brna) rna_def_node_socket_value(brna); rna_def_node_socket_vector(brna); rna_def_node_socket_rgba(brna); - rna_def_node_socket_closure(brna); + rna_def_node_socket_shader(brna); rna_def_node(brna); rna_def_node_link(brna); rna_def_shader_node(brna); diff --git a/source/blender/makesrna/intern/rna_nodetree_types.h b/source/blender/makesrna/intern/rna_nodetree_types.h index d14e4cd76f2..abf421a2b79 100644 --- a/source/blender/makesrna/intern/rna_nodetree_types.h +++ b/source/blender/makesrna/intern/rna_nodetree_types.h @@ -55,8 +55,9 @@ DefNode( ShaderNode, SH_NODE_OUTPUT_LAMP, 0, "OUTPU //DefNode( ShaderNode, SH_NODE_OUTPUT_TEXTURE, 0, "OUTPUT_TEXTURE", OutputTexture, "Texture Output", "" ) DefNode( ShaderNode, SH_NODE_OUTPUT_WORLD, 0, "OUTPUT_WORLD", OutputWorld, "World Output", "" ) DefNode( ShaderNode, SH_NODE_FRESNEL, 0, "FRESNEL", Fresnel, "Fresnel", "" ) -DefNode( ShaderNode, SH_NODE_MIX_CLOSURE, 0, "MIX_CLOSURE", MixClosure, "Mix Closure", "" ) -DefNode( ShaderNode, SH_NODE_ADD_CLOSURE, 0, "ADD_CLOSURE", AddClosure, "Add Closure", "" ) +DefNode( ShaderNode, SH_NODE_BLEND_WEIGHT, 0, "BLEND_WEIGHT", BlendWeight, "BlendWeight", "" ) +DefNode( ShaderNode, SH_NODE_MIX_SHADER, 0, "MIX_SHADER", MixShader, "Mix Shader", "" ) +DefNode( ShaderNode, SH_NODE_ADD_SHADER, 0, "ADD_SHADER", AddShader, "Add Shader", "" ) DefNode( ShaderNode, SH_NODE_ATTRIBUTE, 0, "ATTRIBUTE", Attribute, "Attribute", "") DefNode( ShaderNode, SH_NODE_BACKGROUND, 0, "BACKGROUND", Background, "Background", "") |