diff options
| author | Matt Ebb <matt@mke3.net> | 2009-05-23 11:19:31 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-05-23 11:19:31 +0400 |
| commit | 5b5d2132904a13c31679c263988a4a36bae8eee5 (patch) | |
| tree | 748d5b6015261857007f16d33ca111622c7213d9 /source/blender/editors/interface | |
| parent | 380efe9dc47978431d81642ce538676be59bad18 (diff) | |
* Updated a whole swag of excellent new icons by jendryzch.
This includes a bunch of new object primitive icons
which would be great to get into the 'add object' menus,
they're not there yet. The specific lamp data type icons
are now used in the outliner though, which is very helpful.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_utils.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 1b23967a32d..df069069a33 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -65,10 +65,10 @@ #include "ED_datafiles.h" #define ICON_IMAGE_W 600 -#define ICON_IMAGE_H 512 +#define ICON_IMAGE_H 640 #define ICON_GRID_COLS 26 -#define ICON_GRID_ROWS 24 +#define ICON_GRID_ROWS 30 #define ICON_GRID_MARGIN 5 #define ICON_GRID_W 16 diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index a714d6a6f6f..a7d7246f853 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1982,7 +1982,7 @@ void uiPupMenuOkee(bContext *C, char *opname, char *str, ...) va_list ap; char titlestr[256]; - sprintf(titlestr, "OK? %%i%d", ICON_HELP); + sprintf(titlestr, "OK? %%i%d", ICON_QUESTION); va_start(ap, str); vconfirm_opname(C, opname, titlestr, str, ap); diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 4521bd57a3a..ce44ad53378 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -84,9 +84,9 @@ int UI_GetIconRNA(PointerRNA *ptr) else if(rnatype == &RNA_MeshTextureFace) return ICON_FACESEL_HLT; else if(rnatype == &RNA_VertexGroup) - return ICON_VGROUP; + return ICON_GROUP_VERTEX; else if(rnatype == &RNA_VertexGroupElement) - return ICON_VGROUP; + return ICON_GROUP_VERTEX; else if(rnatype == &RNA_Curve) return ICON_CURVE_DATA; else if(rnatype == &RNA_MetaBall) |