← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/BL_Shader.h

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-07-23 08:54:18 UTC
  • mfrom: (14.2.16 sid)
  • mto: (14.2.19 sid)
  • mto: This revision was merged to the branch mainline in revision 42.
  • Revision ID: package-import@ubuntu.com-20120723085418-9foz30v6afaf5ffs
Tags: 2.63a-2
http://bugs.debian.org/658075
* debian/: Cycles support added (Closes: #658075)
  For now, this top feature has been enabled only
  on [any-amd64 any-i386] architectures because
  of OpenImageIO failing on all others
* debian/: scripts installation path changed
  from /usr/lib to /usr/share:
  + debian/patches/: patchset re-worked for path changing
  + debian/control: "Breaks" field added on yafaray-exporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/BL_Shader.h
 
1
 
 
2
/** \file BL_Shader.h
 
3
 *  \ingroup ketsji
 
4
 */
 
5
 
1
6
#ifndef __BL_SHADER_H__
2
7
#define __BL_SHADER_H__
3
8
 
111
116
 */
112
117
class BL_Shader : public PyObjectPlus
113
118
{
114
 
        Py_Header;
 
119
        Py_Header
115
120
private:
116
121
        typedef std::vector<BL_Uniform*>        BL_UniformVec;
117
122
        typedef std::vector<BL_DefUniform*>     BL_UniformVecDef;
189
194
        bool                            Ok()const;
190
195
        unsigned int            GetProg();
191
196
        void                            SetProg(bool enable);
192
 
        int                                     GetAttribute(){return mAttr;};
 
197
        int                                     GetAttribute() { return mAttr; }
193
198
 
194
199
        // -- 
195
200
        // Apply methods : sets colected uniforms
222
227
        void SetUniform(int uniform, const int val);
223
228
 
224
229
        // Python interface
225
 
#ifndef DISABLE_PYTHON
 
230
#ifdef WITH_PYTHON
226
231
        virtual PyObject* py_repr(void) { return PyUnicode_FromFormat("BL_Shader\n\tvertex shader:%s\n\n\tfragment shader%s\n\n", vertProg, fragProg); }
227
232
 
228
233
        // -----------------------------------