← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/blender/nodes/intern/SHD_nodes/SHD_output.c

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/intern/SHD_nodes/SHD_output.c
1
1
/**
2
 
 * $Id: SHD_output.c 12931 2007-12-17 18:20:48Z theeth $
 
2
 * $Id: SHD_output.c 16366 2008-09-04 20:51:28Z blendix $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
62
62
        }       
63
63
}
64
64
 
 
65
static int gpu_shader_output(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
 
66
{
 
67
        GPUNodeLink *outlink;
 
68
 
 
69
        /*if(in[1].hasinput)
 
70
                GPU_material_enable_alpha(mat);*/
 
71
 
 
72
        GPU_stack_link(mat, "output_node", in, out, &outlink);
 
73
        GPU_material_output_link(mat, outlink);
 
74
 
 
75
        return 1;
 
76
}
 
77
 
65
78
bNodeType sh_node_output= {
66
79
        /* *next,*prev */       NULL, NULL,
67
80
        /* type code   */       SH_NODE_OUTPUT,
76
89
        /* initfunc    */       NULL,
77
90
        /* freestoragefunc    */        NULL,
78
91
        /* copystoragefunc    */        NULL,
79
 
        /* id          */       NULL
 
92
        /* id          */       NULL, NULL, NULL,
 
93
        /* gpufunc     */       gpu_shader_output
80
94
        
81
95
};
82
96