← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/editors/include/UI_icons.h

  • 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/editors/include/UI_icons.h
94
94
DEF_ICON(INLINK)
95
95
DEF_ICON(PLUGIN)
96
96
        
97
 
        /* various ui */        
 
97
        /* various ui */
98
98
DEF_ICON(HELP)
99
99
DEF_ICON(GHOST_ENABLED)
100
 
DEF_ICON(COLOR)
 
100
DEF_ICON(COLOR)  /* see COLOR_RED/GREEN/BLUE */
101
101
DEF_ICON(LINKED)
102
102
DEF_ICON(UNLINKED)
103
103
DEF_ICON(HAND)
428
428
        DEF_ICON(BLANK646)
429
429
        DEF_ICON(BLANK647)
430
430
        DEF_ICON(BLANK648)
431
 
        DEF_ICON(BLANK649)
432
 
        DEF_ICON(BLANK650)
433
 
        DEF_ICON(BLANK651)
 
431
#endif
 
432
DEF_ICON(COLOR_RED)
 
433
DEF_ICON(COLOR_GREEN)
 
434
DEF_ICON(COLOR_BLUE)
 
435
#ifndef DEF_ICON_BLANK_SKIP
434
436
        DEF_ICON(BLANK652)
435
437
        DEF_ICON(BLANK653)
436
438
        DEF_ICON(BLANK654)
450
452
DEF_ICON(FORCE_BOID)
451
453
DEF_ICON(FORCE_TURBULENCE)
452
454
DEF_ICON(FORCE_DRAG)
 
455
DEF_ICON(FORCE_SMOKEFLOW)
453
456
#ifndef DEF_ICON_BLANK_SKIP
454
 
        DEF_ICON(BLANK672)
455
457
        DEF_ICON(BLANK673)
456
458
        DEF_ICON(BLANK674)
457
459
        DEF_ICON(BLANK675)
592
594
DEF_ICON(MOD_REMESH)
593
595
DEF_ICON(MOD_OCEAN)
594
596
DEF_ICON(MOD_WARP)
 
597
DEF_ICON(MOD_SKIN)
 
598
DEF_ICON(MOD_TRIANGULATE)
595
599
#ifndef DEF_ICON_BLANK_SKIP
596
 
        DEF_ICON(BLANK165)
597
600
        DEF_ICON(BLANK166)
598
601
        DEF_ICON(BLANK167)
599
602
        DEF_ICON(BLANK168)
606
609
        DEF_ICON(BLANK175)
607
610
        DEF_ICON(BLANK176)
608
611
        DEF_ICON(BLANK177)
609
 
        DEF_ICON(BLANK177b)
610
612
#endif
611
613
        
612
614
        /* ANIMATION */
697
699
DEF_ICON(PROP_OFF)
698
700
DEF_ICON(PROP_ON)
699
701
DEF_ICON(PROP_CON)
700
 
#ifndef DEF_ICON_BLANK_SKIP
701
 
        DEF_ICON(BLANK212)
702
 
#endif
 
702
DEF_ICON(SCULPT_DYNTOPO)
703
703
DEF_ICON(PARTICLE_POINT)
704
704
DEF_ICON(PARTICLE_TIP)
705
705
DEF_ICON(PARTICLE_PATH)
799
799
DEF_ICON(LAYER_USED)
800
800
DEF_ICON(LAYER_ACTIVE)
801
801
#ifndef DEF_ICON_BLANK_SKIP
 
802
        /* available */
802
803
        DEF_ICON(BLANK254)
803
804
        DEF_ICON(BLANK255)
804
805
        DEF_ICON(BLANK256)
805
806
        DEF_ICON(BLANK257)
806
807
        DEF_ICON(BLANK257b)
807
 
 
808
 
        /* available */
809
808
        DEF_ICON(BLANK258)
810
809
        DEF_ICON(BLANK259)
811
810
        DEF_ICON(BLANK260)
890
889
        DEF_ICON(BLANK313)
891
890
        DEF_ICON(BLANK314)
892
891
        DEF_ICON(BLANK315)
893
 
        DEF_ICON(BLANK316)
894
892
#endif
 
893
DEF_ICON(FILE_BACKUP)
895
894
DEF_ICON(DISK_DRIVE)
896
895
        
897
896
        /* SHADING / TEXT */
974
973
DEF_ICON(BRUSH_INFLATE)
975
974
DEF_ICON(BRUSH_LAYER)
976
975
DEF_ICON(BRUSH_LIGHTEN)
 
976
DEF_ICON(BRUSH_MASK)
977
977
DEF_ICON(BRUSH_MIX)
978
978
DEF_ICON(BRUSH_MULTIPLY)
979
979
DEF_ICON(BRUSH_NUDGE)
990
990
DEF_ICON(BRUSH_ROTATE)
991
991
DEF_ICON(BRUSH_VERTEXDRAW)
992
992
 
 
993
        /* Matcaps */
 
994
DEF_ICON(MATCAP_01)
 
995
DEF_ICON(MATCAP_02)
 
996
DEF_ICON(MATCAP_03)
 
997
DEF_ICON(MATCAP_04)
 
998
DEF_ICON(MATCAP_05)
 
999
DEF_ICON(MATCAP_06)
 
1000
DEF_ICON(MATCAP_07)
 
1001
DEF_ICON(MATCAP_08)
 
1002
DEF_ICON(MATCAP_09)
 
1003
DEF_ICON(MATCAP_10)
 
1004
DEF_ICON(MATCAP_11)
 
1005
DEF_ICON(MATCAP_12)
 
1006
DEF_ICON(MATCAP_13)
 
1007
DEF_ICON(MATCAP_14)
 
1008
DEF_ICON(MATCAP_15)
 
1009
DEF_ICON(MATCAP_16)
 
1010
DEF_ICON(MATCAP_17)
 
1011
DEF_ICON(MATCAP_18)
 
1012
DEF_ICON(MATCAP_19)
 
1013
DEF_ICON(MATCAP_20)
 
1014
DEF_ICON(MATCAP_21)
 
1015
DEF_ICON(MATCAP_22)
 
1016
DEF_ICON(MATCAP_23)
 
1017
DEF_ICON(MATCAP_24)
 
1018
 
993
1019
/* vector icons, VICO_ prefix added */  
994
1020
DEF_VICO(VIEW3D_VEC)
995
1021
DEF_VICO(EDIT_VEC)
996
 
DEF_VICO(EDITMODE_DEHLT)
997
 
DEF_VICO(EDITMODE_HLT)
 
1022
DEF_VICO(EDITMODE_VEC_DEHLT)
 
1023
DEF_VICO(EDITMODE_VEC_HLT)
998
1024
DEF_VICO(DISCLOSURE_TRI_RIGHT_VEC)
999
1025
DEF_VICO(DISCLOSURE_TRI_DOWN_VEC)
1000
1026
DEF_VICO(MOVE_UP_VEC)