← 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_tex_voronoi.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_tex_voronoi.c
29
29
 
30
30
/* **************** VORONOI ******************** */
31
31
 
32
 
static bNodeSocketTemplate sh_node_tex_voronoi_in[]= {
33
 
        {       SOCK_VECTOR, 1, "Vector",               0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
34
 
        {       SOCK_FLOAT, 1, "Scale",                 5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
35
 
        {       -1, 0, ""       }
36
 
};
37
 
 
38
 
static bNodeSocketTemplate sh_node_tex_voronoi_out[]= {
39
 
        {       SOCK_RGBA, 0, "Color",          0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
40
 
        {       SOCK_FLOAT, 0, "Fac",           0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
41
 
        {       -1, 0, ""       }
42
 
};
43
 
 
44
 
static void node_shader_init_tex_voronoi(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
 
32
static bNodeSocketTemplate sh_node_tex_voronoi_in[] = {
 
33
        {       SOCK_VECTOR, 1, N_("Vector"),           0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
 
34
        {       SOCK_FLOAT, 1, N_("Scale"),                     5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
 
35
        {       -1, 0, ""       }
 
36
};
 
37
 
 
38
static bNodeSocketTemplate sh_node_tex_voronoi_out[] = {
 
39
        {       SOCK_RGBA, 0, N_("Color"),              0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
40
        {       SOCK_FLOAT, 0, N_("Fac"),               0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
41
        {       -1, 0, ""       }
 
42
};
 
43
 
 
44
static void node_shader_init_tex_voronoi(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
45
45
{
46
46
        NodeTexVoronoi *tex = MEM_callocN(sizeof(NodeTexVoronoi), "NodeTexVoronoi");
47
47
        default_tex_mapping(&tex->base.tex_mapping);