diff options
| author | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
|---|---|---|
| committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-14 02:54:02 +0300 |
| commit | a68a7f42b02ad0260220d94f36ab61c772db071a (patch) | |
| tree | 620b763cd24fbfc1259f00ccb005217914af0c6f /source/blender/include/BIF_resources.h | |
| parent | 526d0bec4722900a86d81ff0f5d71504b2b4ad8c (diff) | |
| parent | 15215493bf9d1d08e650109e6eb6189fc76e289e (diff) | |
resolved conflict state with HEAD r14096
blenderbuttons still bad
not let this compile
Diffstat (limited to 'source/blender/include/BIF_resources.h')
| -rw-r--r-- | source/blender/include/BIF_resources.h | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h index 7f3b27fcf2f..1649287297b 100644 --- a/source/blender/include/BIF_resources.h +++ b/source/blender/include/BIF_resources.h @@ -58,24 +58,24 @@ typedef enum { ICON_SPACE4, ICON_TRIA_LEFT, ICON_TRIA_UP, - ICON_NDOF_TURN, - ICON_NDOF_FLY, - ICON_NDOF_TRANS, - ICON_NDOF_DOM, + ICON_FONTPREVIEW, + ICON_BLANK4, + ICON_BLANK5, + ICON_BLANK6, ICON_ORTHO, ICON_PERSP, ICON_CAMERA, - ICON_EFFECTS, + ICON_PARTICLES, ICON_BBOX, ICON_WIRE, ICON_SOLID, ICON_SMOOTH, ICON_POTATO, ICON_MARKER_HLT, - ICON_NORMALVIEW, - ICON_LOCALVIEW, - ICON_UNUSEDVIEW, + ICON_PMARKER_ACT, + ICON_PMARKER_SEL, + ICON_PMARKER, ICON_VIEWZOOM, ICON_SORTALPHA, ICON_SORTTIME, @@ -84,10 +84,10 @@ typedef enum { ICON_SHORTDISPLAY, ICON_TRIA_DOWN, ICON_TRIA_RIGHT, - ICON_BLANK7, - ICON_BLANK8, - ICON_BLANK9, - ICON_BLANK10, + ICON_NDOF_TURN, + ICON_NDOF_FLY, + ICON_NDOF_TRANS, + ICON_NDOF_DOM, ICON_VIEW_AXIS_ALL, ICON_VIEW_AXIS_NONE, @@ -123,9 +123,9 @@ typedef enum { ICON_AXIS_SIDE, ICON_AXIS_FRONT, ICON_AXIS_TOP, - ICON_DRAW_UVFACES, - ICON_STICKY_UVS, - ICON_STICKY2_UVS, + ICON_STICKY_UVS_LOC, + ICON_STICKY_UVS_DISABLE, + ICON_STICKY_UVS_VERT, ICON_PREV_KEYFRAME, ICON_NEXT_KEYFRAME, ICON_ENVMAP, @@ -164,7 +164,7 @@ typedef enum { ICON_FACESEL_DEHLT, ICON_FACESEL_HLT, ICON_EDIT_DEHLT, - ICON_BLANK19, + ICON_BOOKMARKS, ICON_BLANK20, ICON_BLANK21, ICON_BLANK22, @@ -268,7 +268,7 @@ typedef enum { ICON_EYEDROPPER, ICON_WINDOW_WINDOW, ICON_PANEL_CLOSE, - ICON_BLANK35, + ICON_PHYSICS, ICON_BLANK36, ICON_BLANK37, ICON_BLANK38, @@ -317,13 +317,13 @@ typedef enum { ICON_HOME, ICON_CLIPUV_DEHLT, ICON_CLIPUV_HLT, - ICON_SOME_WACKY_VERTS_AND_LINES, - ICON_A_WACKY_VERT_AND_SOME_LINES, + ICON_BLANK2, + ICON_BLANK3, ICON_VPAINT_COL, ICON_RESTRICT_SELECT_OFF, ICON_RESTRICT_SELECT_ON, - ICON_BLANK45, - ICON_BLANK46, + ICON_MUTE_IPO_OFF, + ICON_MUTE_IPO_ON, ICON_MAN_TRANS, ICON_MAN_ROT, @@ -494,6 +494,7 @@ enum { TH_NORMAL, TH_FACE_DOT, TH_FACEDOT_SIZE, + TH_CFRAME, TH_SYNTAX_B, TH_SYNTAX_V, @@ -525,6 +526,7 @@ enum { TH_SEQ_META, TH_EDGE_SHARP, + TH_EDITMESH_ACTIVE, }; /* XXX WARNING: previous is saved in file, so do not change order! */ |