← 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_mixRgb.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_mixRgb.c
33
33
#include "node_shader_util.h"
34
34
 
35
35
/* **************** MIX RGB ******************** */
36
 
static bNodeSocketTemplate sh_node_mix_rgb_in[]= {
37
 
        {       SOCK_FLOAT, 1, "Fac",                   0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
38
 
        {       SOCK_RGBA, 1, "Color1",                 0.5f, 0.5f, 0.5f, 1.0f},
39
 
        {       SOCK_RGBA, 1, "Color2",                 0.5f, 0.5f, 0.5f, 1.0f},
 
36
static bNodeSocketTemplate sh_node_mix_rgb_in[] = {
 
37
        {       SOCK_FLOAT, 1, N_("Fac"),                       0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
 
38
        {       SOCK_RGBA, 1, N_("Color1"),                     0.5f, 0.5f, 0.5f, 1.0f},
 
39
        {       SOCK_RGBA, 1, N_("Color2"),                     0.5f, 0.5f, 0.5f, 1.0f},
40
40
        {       -1, 0, ""       }
41
41
};
42
 
static bNodeSocketTemplate sh_node_mix_rgb_out[]= {
43
 
        {       SOCK_RGBA, 0, "Color"},
 
42
static bNodeSocketTemplate sh_node_mix_rgb_out[] = {
 
43
        {       SOCK_RGBA, 0, N_("Color")},
44
44
        {       -1, 0, ""       }
45
45
};
46
46