← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/shader/nodes/node_shader_output_material.c
29
29
 
30
30
/* **************** OUTPUT ******************** */
31
31
 
32
 
static bNodeSocketTemplate sh_node_output_material_in[]= {
33
 
        {       SOCK_SHADER, 1, "Surface"},
34
 
        {       SOCK_SHADER, 1, "Volume"},
35
 
        {       SOCK_FLOAT, 1, "Displacement",  0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
 
32
static bNodeSocketTemplate sh_node_output_material_in[] = {
 
33
        {       SOCK_SHADER, 1, N_("Surface")},
 
34
        {       SOCK_SHADER, 1, N_("Volume")},
 
35
        {       SOCK_FLOAT, 1, N_("Displacement"),      0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
36
36
        {       -1, 0, ""       }
37
37
};
38
38
 
62
62
        node_type_gpu(&ntype, node_shader_gpu_output_material);
63
63
 
64
64
        /* Do not allow muting output node. */
65
 
        node_type_internal_connect(&ntype, NULL);
 
65
        node_type_internal_links(&ntype, NULL);
66
66
 
67
67
        nodeRegisterType(ttype, &ntype);
68
68
}