← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/makesdna/DNA_brush_types.h

  • 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/makesdna/DNA_brush_types.h
1
1
/**
2
 
 * $Id: DNA_brush_types.h 12931 2007-12-17 18:20:48Z theeth $
 
2
 * $Id: DNA_brush_types.h 16366 2008-09-04 20:51:28Z blendix $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
33
33
#include "DNA_ID.h"
34
34
 
35
35
#ifndef MAX_MTEX
36
 
#define MAX_MTEX        10
 
36
#define MAX_MTEX        18
37
37
#endif
38
38
 
39
39
struct MTex;
58
58
        float alpha;                            /* opacity */
59
59
 
60
60
        short texact, pad;
61
 
        struct MTex *mtex[10];
 
61
        struct MTex *mtex[18];          /* MAX_MTEX */
62
62
 
63
63
        struct BrushClone clone;
64
64
} Brush;