diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2004-09-06 12:10:56 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2004-09-06 12:10:56 +0400 |
| commit | 17e20e26ba26679a958f3864e828f06445f3c3f8 (patch) | |
| tree | 75d77fa5029d6fe271b9bdcb60d8dd20584f96dd | |
| parent | 28d1b60059846dc433a2820e49dda11302a0d785 (diff) | |
Add theme colour for "Draw Normals"
| -rw-r--r-- | source/blender/include/BIF_resources.h | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 | ||||
| -rw-r--r-- | source/blender/src/drawobject.c | 3 | ||||
| -rw-r--r-- | source/blender/src/resources.c | 8 | ||||
| -rw-r--r-- | source/blender/src/space.c | 2 |
5 files changed, 13 insertions, 6 deletions
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h index 0456ec4251b..d5efcf85d80 100644 --- a/source/blender/include/BIF_resources.h +++ b/source/blender/include/BIF_resources.h @@ -380,7 +380,8 @@ enum { TH_EDGE_SEAM, TH_EDGE_FACESEL, TH_FACE, - TH_FACE_SELECT + TH_FACE_SELECT, + TH_NORMAL }; /* specific defines per space should have higher define values */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index fef367b6e3f..6f589cd9fed 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -84,9 +84,10 @@ typedef struct ThemeSpace { char edge[4], edge_select[4]; char edge_seam[4], edge_facesel[4]; char face[4], face_select[4]; + char normal[4]; char vertex_size, pad; - short pad1; + short pad1[3]; } ThemeSpace; diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 3bdde7e89fa..127ba5d5582 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -2536,7 +2536,8 @@ static void drawmeshwire(Object *ob) tekenvertices(1); if(G.f & G_DRAWNORMALS) { /* normals */ - cpack(0xDDDD22); + /*cpack(0xDDDD22);*/ + BIF_ThemeColor(TH_NORMAL); glBegin(GL_LINES); diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index 00260e3005d..15fea1251df 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -461,6 +461,8 @@ char *BIF_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) cp= ts->face; break; case TH_FACE_SELECT: cp= ts->face_select; break; + case TH_NORMAL: + cp= ts->normal; break; } @@ -535,6 +537,7 @@ void BIF_InitTheme(void) SETCOL(btheme->tv3d.edge_facesel, 75, 75, 75, 255); SETCOL(btheme->tv3d.face, 0, 50, 150, 30); SETCOL(btheme->tv3d.face_select, 200, 100, 200, 60); + SETCOL(btheme->tv3d.normal, 0x22, 0xDD, 0xDD, 255); /* space buttons */ /* to have something initialized */ @@ -635,7 +638,7 @@ void BIF_InitTheme(void) char *BIF_ThemeColorsPup(int spacetype) { - char *cp= MEM_callocN(20*32, "theme pup"); + char *cp= MEM_callocN(21*32, "theme pup"); char str[32]; if(spacetype==0) { @@ -682,7 +685,8 @@ char *BIF_ThemeColorsPup(int spacetype) sprintf(str, "Edge Seam %%x%d|", TH_EDGE_SEAM); strcat(cp, str); sprintf(str, "Edge UV Face Select %%x%d|", TH_EDGE_FACESEL); strcat(cp, str); sprintf(str, "Face %%x%d|", TH_FACE); strcat(cp, str); - sprintf(str, "Face Selected %%x%d", TH_FACE_SELECT); strcat(cp, str); + sprintf(str, "Face Selected %%x%d|", TH_FACE_SELECT); strcat(cp, str); + sprintf(str, "Normal %%x%d", TH_NORMAL); strcat(cp, str); } else if(spacetype==SPACE_IPO) { sprintf(str, "Panel %%x%d|", TH_PANEL); strcat(cp, str); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 930f9a3eb37..6300139888c 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1913,7 +1913,7 @@ void info_user_themebuts(uiBlock *block, short y1, short y2, short y3) int spacetype= 0; static short cur=1, curmain=2; short a, tot=0, isbuiltin= 0; - char string[20*32], *strp, *col; + char string[21*32], *strp, *col; y3= y2+23; // exception! |