← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/nodes/texture/nodes/node_texture_at.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/texture/nodes/node_texture_at.c
33
33
#include "node_texture_util.h"
34
34
#include "NOD_texture.h"
35
35
 
36
 
static bNodeSocketTemplate inputs[]= {
37
 
        { SOCK_RGBA,   1, "Texture",     0.0f, 0.0f, 0.0f, 1.0f },
38
 
        { SOCK_VECTOR, 1, "Coordinates", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
 
36
static bNodeSocketTemplate inputs[] = {
 
37
        { SOCK_RGBA,   1, N_("Texture"),     0.0f, 0.0f, 0.0f, 1.0f },
 
38
        { SOCK_VECTOR, 1, N_("Coordinates"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
39
39
        { -1, 0, "" }
40
40
};
41
 
static bNodeSocketTemplate outputs[]= {
42
 
        { SOCK_RGBA,   0, "Texture" },
 
41
static bNodeSocketTemplate outputs[] = {
 
42
        { SOCK_RGBA,   0, N_("Texture") },
43
43
        { -1, 0, "" }
44
44
};
45
45