← 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_gamma.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_gamma.c
29
29
#include "node_shader_util.h"
30
30
 
31
31
/* **************** Gamma Tools  ******************** */
32
 
  
33
 
static bNodeSocketTemplate sh_node_gamma_in[]= {
34
 
        {       SOCK_RGBA, 1, "Color",                  1.0f, 1.0f, 1.0f, 1.0f},
35
 
        {       SOCK_FLOAT, 1, "Gamma",                 1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
 
32
 
 
33
static bNodeSocketTemplate sh_node_gamma_in[] = {
 
34
        {       SOCK_RGBA, 1, N_("Color"),                      1.0f, 1.0f, 1.0f, 1.0f},
 
35
        {       SOCK_FLOAT, 1, N_("Gamma"),                     1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
36
36
        {       -1, 0, ""       }
37
37
};
38
38
 
39
 
static bNodeSocketTemplate sh_node_gamma_out[]= {
40
 
        {       SOCK_RGBA, 0, "Color"},
 
39
static bNodeSocketTemplate sh_node_gamma_out[] = {
 
40
        {       SOCK_RGBA, 0, N_("Color")},
41
41
        {       -1, 0, ""       }
42
42
};
43
43