← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/nodes/shader/nodes/node_shader_mix_shader.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/shader/nodes/node_shader_mix_shader.c
30
30
/* **************** OUTPUT ******************** */
31
31
 
32
32
static bNodeSocketTemplate sh_node_mix_shader_in[] = {
33
 
        {       SOCK_FLOAT,  1, N_("Fac"),              0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
33
        {       SOCK_FLOAT,  1, N_("Fac"),              0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
34
34
        {       SOCK_SHADER, 1, N_("Shader")},
35
35
        {       SOCK_SHADER, 1, N_("Shader")},
36
36
        {       -1, 0, ""       }
41
41
        {       -1, 0, ""       }
42
42
};
43
43
 
44
 
static int node_shader_gpu_mix_shader(GPUMaterial *mat, bNode *UNUSED(node), GPUNodeStack *in, GPUNodeStack *out)
 
44
static int node_shader_gpu_mix_shader(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
45
45
{
46
46
        return GPU_stack_link(mat, "node_mix_shader", in, out);
47
47
}
48
48
 
49
49
/* node type definition */
50
 
void register_node_type_sh_mix_shader(bNodeTreeType *ttype)
 
50
void register_node_type_sh_mix_shader(void)
51
51
{
52
52
        static bNodeType ntype;
53
53
 
54
 
        node_type_base(ttype, &ntype, SH_NODE_MIX_SHADER, "Mix Shader", NODE_CLASS_SHADER, 0);
 
54
        sh_node_type_base(&ntype, SH_NODE_MIX_SHADER, "Mix Shader", NODE_CLASS_SHADER, 0);
55
55
        node_type_compatibility(&ntype, NODE_NEW_SHADING);
56
56
        node_type_socket_templates(&ntype, sh_node_mix_shader_in, sh_node_mix_shader_out);
57
 
        node_type_size(&ntype, 150, 60, 200);
58
57
        node_type_init(&ntype, NULL);
59
58
        node_type_storage(&ntype, "", NULL, NULL);
60
 
        node_type_exec(&ntype, NULL);
61
59
        node_type_gpu(&ntype, node_shader_gpu_mix_shader);
62
60
 
63
 
        nodeRegisterType(ttype, &ntype);
 
61
        nodeRegisterType(&ntype);
64
62
}