diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
| commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
| tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /source/blender/editors/include/UI_icons.h | |
| parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
| parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) | |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'source/blender/editors/include/UI_icons.h')
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 30560687702..6a139b124a6 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -27,8 +27,8 @@ */ /* Note: this is included twice with different #defines for DEF_ICON - once from UI_resources.h for the internal icon enum and once fro interface_api.c for - definition of the RNA enum for he icons */ + once from UI_resources.h for the internal icon enum and + once for interface_api.c for the definition of the RNA enum for the icons */ DEF_ICON(ICON_BLENDER) DEF_ICON(ICON_QUESTION) @@ -107,7 +107,7 @@ DEF_ICON(ICON_NEW) DEF_ICON(ICON_FILE_TICK) DEF_ICON(ICON_QUIT) DEF_ICON(ICON_URL) -DEF_ICON(ICON_BLANK037) +DEF_ICON(ICON_RECOVER_LAST) DEF_ICON(ICON_BLANK038) DEF_ICON(ICON_FULLSCREEN_ENTER) DEF_ICON(ICON_FULLSCREEN_EXIT) @@ -540,7 +540,7 @@ DEF_ICON(ICON_MOD_FLUIDSIM) DEF_ICON(ICON_MOD_MULTIRES) DEF_ICON(ICON_MOD_SMOKE) DEF_ICON(ICON_MOD_SOLIDIFY) -DEF_ICON(ICON_MOD_SCREW) // XXX, needs drawing +DEF_ICON(ICON_MOD_SCREW) DEF_ICON(ICON_BLANK160) DEF_ICON(ICON_BLANK161) DEF_ICON(ICON_BLANK162) @@ -571,7 +571,7 @@ DEF_ICON(ICON_PREV_KEYFRAME) DEF_ICON(ICON_NEXT_KEYFRAME) DEF_ICON(ICON_PLAY_AUDIO) DEF_ICON(ICON_PLAY_REVERSE) -DEF_ICON(ICON_BLANK179) +DEF_ICON(ICON_PREVIEW_RANGE) DEF_ICON(ICON_BLANK180) DEF_ICON(ICON_PMARKER_ACT) DEF_ICON(ICON_PMARKER_SEL) @@ -682,7 +682,7 @@ DEF_ICON(ICON_BLANK227) DEF_ICON(ICON_BLANK228) DEF_ICON(ICON_BLANK229) DEF_ICON(ICON_BLANK230) -DEF_ICON(ICON_BLANK231) +DEF_ICON(ICON_SNAP_SURFACE) DEF_ICON(ICON_BLANK232) DEF_ICON(ICON_BLANK233) DEF_ICON(ICON_RETOPO) @@ -847,7 +847,7 @@ DEF_ICON(ICON_SEQ_PREVIEW) DEF_ICON(ICON_SEQ_LUMA_WAVEFORM) DEF_ICON(ICON_SEQ_CHROMA_SCOPE) DEF_ICON(ICON_SEQ_HISTOGRAM) -DEF_ICON(ICON_BLANK330) +DEF_ICON(ICON_SEQ_SPLITVIEW) DEF_ICON(ICON_BLANK331) DEF_ICON(ICON_BLANK332) DEF_ICON(ICON_BLANK333) @@ -869,6 +869,37 @@ DEF_ICON(ICON_BLANK345) DEF_ICON(ICON_BLANK346) DEF_ICON(ICON_BLANK346b) + /* brush icons */ + +DEF_ICON(ICON_BRUSH_ADD) +DEF_ICON(ICON_BRUSH_BLOB) +DEF_ICON(ICON_BRUSH_BLUR) +DEF_ICON(ICON_BRUSH_CLAY) +DEF_ICON(ICON_BRUSH_CLONE) +DEF_ICON(ICON_BRUSH_CREASE) +DEF_ICON(ICON_BRUSH_DARKEN) +DEF_ICON(ICON_BRUSH_FILL) +DEF_ICON(ICON_BRUSH_FLATTEN) +DEF_ICON(ICON_BRUSH_GRAB) +DEF_ICON(ICON_BRUSH_INFLATE) +DEF_ICON(ICON_BRUSH_LAYER) +DEF_ICON(ICON_BRUSH_LIGHTEN) +DEF_ICON(ICON_BRUSH_MIX) +DEF_ICON(ICON_BRUSH_MULTIPLY) +DEF_ICON(ICON_BRUSH_NUDGE) +DEF_ICON(ICON_BRUSH_PINCH) +DEF_ICON(ICON_BRUSH_SCRAPE) +DEF_ICON(ICON_BRUSH_SCULPT_DRAW) +DEF_ICON(ICON_BRUSH_SMEAR) +DEF_ICON(ICON_BRUSH_SMOOTH) +DEF_ICON(ICON_BRUSH_SNAKE_HOOK) +DEF_ICON(ICON_BRUSH_SOFTEN) +DEF_ICON(ICON_BRUSH_SUBTRACT) +DEF_ICON(ICON_BRUSH_TEXDRAW) +DEF_ICON(ICON_BRUSH_THUMB) +DEF_ICON(ICON_BRUSH_ROTATE) +DEF_ICON(ICON_BRUSH_VERTEXDRAW) + /* vector icons */ DEF_ICON(VICO_VIEW3D_VEC) |