← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/include/BIF_resources.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/include/BIF_resources.h
1
1
/**
2
 
 * $Id: BIF_resources.h 14444 2008-04-16 22:40:48Z hos $
 
2
 * $Id: BIF_resources.h 16409 2008-09-07 16:37:55Z campbellbarton $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
57
57
        ICON_TRIA_UP,
58
58
        ICON_FONTPREVIEW,
59
59
        ICON_BLANK4,
60
 
        ICON_BLANK5,
61
 
        ICON_BLANK6,
 
60
        ICON_WORDWRAP,
 
61
        ICON_WORDWRAP_OFF,
62
62
        
63
63
        ICON_ORTHO,
64
64
        ICON_PERSP,
108
108
        ICON_FF,
109
109
        ICON_REW,
110
110
        ICON_PYTHON,
111
 
        ICON_BLANK11,
 
111
        ICON_PYTHON_ON,
112
112
        ICON_BLANK12,
113
113
        ICON_BLANK13,
114
114
        ICON_BLANK14,
266
266
        ICON_WINDOW_WINDOW,
267
267
        ICON_PANEL_CLOSE,
268
268
        ICON_PHYSICS,
269
 
        ICON_BLANK36,
270
 
        ICON_BLANK37,
 
269
        ICON_LAYER_USED,
 
270
        ICON_LAYER_ACTIVE,
271
271
        ICON_BLANK38,
272
272
        
273
273
        ICON_BLENDER,
293
293
        ICON_ARMATURE_DEHLT,
294
294
        ICON_SNAP_GEAR,
295
295
        ICON_SNAP_GEO,
296
 
        ICON_BLANK41,
 
296
        ICON_SNAP_NORMAL,
297
297
        ICON_BLANK42,
298
298
        
299
299
        ICON_SMOOTHCURVE,
524
524
        
525
525
        TH_EDGE_SHARP,
526
526
        TH_EDITMESH_ACTIVE,
 
527
 
 
528
        TH_HANDLE_VERTEX,
 
529
        TH_HANDLE_VERTEX_SELECT,
 
530
        TH_HANDLE_VERTEX_SIZE,
527
531
};
528
532
/* XXX WARNING: previous is saved in file, so do not change order! */
529
533
 
591
595
char    *BIF_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid);
592
596
char    *BIF_ThemeColorsPup(int spacetype);
593
597
 
 
598
/* only for Bone Color sets */
 
599
char *BIF_ThemeColorSetsPup(short inc_custom);
 
600
 
594
601
 
595
602
void    BIF_def_color                   (BIFColorID colorid, unsigned char r, unsigned char g, unsigned char b);
596
603