Page MenuHome
Files F2958

patch.txt
Public
Actions

patch.txt
View Options

? blender/.sconsign.dblite
? blender/user-config.py
? blender/tools/Blender.pyc
? blender/tools/__init__.pyc
? blender/tools/bcolors.pyc
? blender/tools/btools.pyc
Index: blender/source/blender/include/BIF_resources.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/include/BIF_resources.h,v
retrieving revision 1.58
diff -u -r1.58 BIF_resources.h
--- blender/source/blender/include/BIF_resources.h 25 Sep 2006 11:33:53 -0000 1.58
+++ blender/source/blender/include/BIF_resources.h 4 Oct 2006 12:04:38 -0000
@@ -442,7 +442,7 @@
TH_EDGE_FACESEL,
TH_FACE,
TH_FACE_SELECT,
- TH_NORMAL,
+ TH_NORMAL_START,
TH_FACE_DOT,
TH_FACEDOT_SIZE,
@@ -474,6 +474,8 @@
TH_SEQ_PLUGIN,
TH_SEQ_TRANSITION,
TH_SEQ_META,
+
+ TH_NORMAL_END,
};
/* XXX WARNING: previous is saved in file, so do not change order! */
Index: blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_userdef_types.h,v
retrieving revision 1.56
diff -u -r1.56 DNA_userdef_types.h
--- blender/source/blender/makesdna/DNA_userdef_types.h 8 Jun 2006 19:05:58 -0000 1.56
+++ blender/source/blender/makesdna/DNA_userdef_types.h 4 Oct 2006 12:04:38 -0000
@@ -86,12 +86,12 @@
char edge_seam[4], edge_facesel[4];
char face[4], face_select[4]; // solid faces
char face_dot[4]; // selected color
- char normal[4];
+ char normal_start[4], normal_end[4];
char bone_solid[4], bone_pose[4];
char strip[4], strip_select[4];
char vertex_size, facedot_size;
- char bpad[2];
+ char bpad[6];
char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes
char syntaxv[4], syntaxc[4];
Index: blender/source/blender/src/drawobject.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawobject.c,v
retrieving revision 1.292
diff -u -r1.292 drawobject.c
--- blender/source/blender/src/drawobject.c 1 Oct 2006 18:28:46 -0000 1.292
+++ blender/source/blender/src/drawobject.c 4 Oct 2006 12:04:38 -0000
@@ -1241,20 +1241,28 @@
* logic!!!
*/
+typedef struct normal_colors {
+ char start[4], end[4];
+} normal_colors;
+
+
static void draw_dm_face_normals__mapFunc(void *userData, int index, float *cent, float *no)
{
+ normal_colors *clrs = userData;
EditFace *efa = EM_get_face_for_index(index);
if (efa->h==0 && efa->fgonf!=EM_FGON) {
+ glColor4ubv(clrs->start);
glVertex3fv(cent);
+ glColor4ubv(clrs->end);
glVertex3f( cent[0] + no[0]*G.scene->editbutsize,
cent[1] + no[1]*G.scene->editbutsize,
cent[2] + no[2]*G.scene->editbutsize);
}
}
-static void draw_dm_face_normals(DerivedMesh *dm) {
+static void draw_dm_face_normals(DerivedMesh *dm, void *userData) {
glBegin(GL_LINES);
- dm->foreachMappedFaceCenter(dm, draw_dm_face_normals__mapFunc, 0);
+ dm->foreachMappedFaceCenter(dm, draw_dm_face_normals__mapFunc, userData);
glEnd();
}
@@ -1276,11 +1284,14 @@
static void draw_dm_vert_normals__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s)
{
+ normal_colors *clrs = userData;
EditVert *eve = EM_get_vert_for_index(index);
if (eve->h==0) {
+ glColor4ubv(clrs->start);
glVertex3fv(co);
+ glColor4ubv(clrs->end);
if (no_f) {
glVertex3f( co[0] + no_f[0]*G.scene->editbutsize,
co[1] + no_f[1]*G.scene->editbutsize,
@@ -1292,9 +1303,9 @@
}
}
}
-static void draw_dm_vert_normals(DerivedMesh *dm) {
+static void draw_dm_vert_normals(DerivedMesh *dm, void *userData) {
glBegin(GL_LINES);
- dm->foreachMappedVert(dm, draw_dm_vert_normals__mapFunc, NULL);
+ dm->foreachMappedVert(dm, draw_dm_vert_normals__mapFunc, userData);
glEnd();
}
@@ -1867,12 +1878,24 @@
draw_em_fancy_verts(em, cageDM);
if(G.f & G_DRAWNORMALS) {
- BIF_ThemeColor(TH_NORMAL);
- draw_dm_face_normals(cageDM);
+ normal_colors co;
+
+ BIF_GetThemeColor4ubv(TH_NORMAL_START, &co.start[0]);
+ BIF_GetThemeColor4ubv(TH_NORMAL_END, &co.end[0]);
+
+ glShadeModel(GL_SMOOTH);
+ draw_dm_face_normals(cageDM, &co);
+ glShadeModel(GL_FLAT);
}
if(G.f & G_DRAW_VNORMALS) {
- BIF_ThemeColor(TH_NORMAL);
- draw_dm_vert_normals(cageDM);
+ normal_colors co;
+
+ BIF_GetThemeColor4ubv(TH_NORMAL_START, &co.start[0]);
+ BIF_GetThemeColor4ubv(TH_NORMAL_END, &co.end[0]);
+
+ glShadeModel(GL_SMOOTH);
+ draw_dm_vert_normals(cageDM, &co);
+ glShadeModel(GL_FLAT);
}
if(G.f & (G_DRAW_EDGELEN|G_DRAW_FACEAREA|G_DRAW_EDGEANG))
Index: blender/source/blender/src/resources.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/resources.c,v
retrieving revision 1.60
diff -u -r1.60 resources.c
--- blender/source/blender/src/resources.c 3 Jul 2006 09:49:12 -0000 1.60
+++ blender/source/blender/src/resources.c 4 Oct 2006 12:04:38 -0000
@@ -257,8 +257,10 @@
cp= ts->face_dot; break;
case TH_FACEDOT_SIZE:
cp= &ts->facedot_size; break;
- case TH_NORMAL:
- cp= ts->normal; break;
+ case TH_NORMAL_START:
+ cp= ts->normal_start; break;
+ case TH_NORMAL_END:
+ cp= ts->normal_end; break;
case TH_BONE_SOLID:
cp= ts->bone_solid; break;
case TH_BONE_POSE:
@@ -387,7 +389,8 @@
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);
+ SETCOL(btheme->tv3d.normal_start, 0xFF, 0, 0, 255);
+ SETCOL(btheme->tv3d.normal_end, 0, 0xFF, 0, 255);
SETCOL(btheme->tv3d.face_dot, 255, 138, 48, 255);
btheme->tv3d.facedot_size= 4;
@@ -578,7 +581,8 @@
str += sprintf(str, "Face Selected (transp) %%x%d|", TH_FACE_SELECT);
str += sprintf(str, "Face Dot Selected %%x%d|", TH_FACE_DOT);
str += sprintf(str, "Face Dot Size %%x%d|", TH_FACEDOT_SIZE);
- str += sprintf(str, "Normal %%x%d|", TH_NORMAL);
+ str += sprintf(str, "Normal Start %%x%d|", TH_NORMAL_START);
+ str += sprintf(str, "Normal End %%x%d|", TH_NORMAL_END);
str += sprintf(str, "Bone Solid %%x%d|", TH_BONE_SOLID);
str += sprintf(str, "Bone Pose %%x%d", TH_BONE_POSE);
break;
Index: blender/source/blender/src/usiblender.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/usiblender.c,v
retrieving revision 1.126
diff -u -r1.126 usiblender.c
--- blender/source/blender/src/usiblender.c 16 Sep 2006 11:58:38 -0000 1.126
+++ blender/source/blender/src/usiblender.c 4 Oct 2006 12:04:47 -0000
@@ -213,8 +213,11 @@
if(btheme->tv3d.edge_seam[3]==0) {
SETCOL(btheme->tv3d.edge_seam, 230, 150, 50, 255);
}
- if(btheme->tv3d.normal[3]==0) {
- SETCOL(btheme->tv3d.normal, 0x22, 0xDD, 0xDD, 255);
+ if(btheme->tv3d.normal_start[3]==0) {
+ SETCOL(btheme->tv3d.normal_start, 0xFF, 0, 0, 255);
+ }
+ if(btheme->tv3d.normal_end[3]==0) {
+ SETCOL(btheme->tv3d.normal_end, 0, 0xFF, 0, 255);
}
if(btheme->tv3d.face_dot[3]==0) {
SETCOL(btheme->tv3d.face_dot, 255, 138, 48, 255);

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
d6/cc/a685f9f4378f9ca14ba2835a8645

Event Timeline