Cycles: svn merge -r41531:41613 ^/trunk/blender
[blender.git] / source / blender / nodes / shader / nodes / node_shader_mixRgb.c
index 7692956..2652145 100644 (file)
@@ -35,8 +35,8 @@
 /* **************** MIX RGB ******************** */
 static bNodeSocketTemplate sh_node_mix_rgb_in[]= {
        {       SOCK_FLOAT, 1, "Fac",                   0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-       {       SOCK_RGBA, 1, "Color1",                 0.5f, 0.5f, 0.5f, 1.0f},
-       {       SOCK_RGBA, 1, "Color2",                 0.5f, 0.5f, 0.5f, 1.0f},
+       {       SOCK_RGBA, 1, "Color",                  0.5f, 0.5f, 0.5f, 1.0f},
+       {       SOCK_RGBA, 1, "Color",                  0.5f, 0.5f, 0.5f, 1.0f},
        {       -1, 0, ""       }
 };
 static bNodeSocketTemplate sh_node_mix_rgb_out[]= {
@@ -78,7 +78,7 @@ void register_node_type_sh_mix_rgb(ListBase *lb)
        static bNodeType ntype;
 
        node_type_base(&ntype, SH_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
-       node_type_compatibility(&ntype, NODE_OLD_SHADING);
+       node_type_compatibility(&ntype, NODE_OLD_SHADING|NODE_NEW_SHADING);
        node_type_socket_templates(&ntype, sh_node_mix_rgb_in, sh_node_mix_rgb_out);
        node_type_size(&ntype, 100, 60, 150);
        node_type_label(&ntype, node_blend_label);