Page MenuHome
Files F3725

ipodotsize.txt
Public
Actions

ipodotsize.txt
View Options

Index: source/blender/include/BIF_resources.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/include/BIF_resources.h,v
retrieving revision 1.61
diff -u -p -u -r1.61 BIF_resources.h
--- source/blender/include/BIF_resources.h 20 Nov 2006 05:12:55 -0000 1.61
+++ source/blender/include/BIF_resources.h 1 Dec 2006 07:36:26 -0000
@@ -523,6 +523,7 @@ enum {
TH_SEQ_TRANSITION,
TH_SEQ_META,
+ TH_IPO_VERTEX_SIZE,
};
/* XXX WARNING: previous is saved in file, so do not change order! */
Index: source/blender/makesdna/DNA_userdef_types.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_userdef_types.h,v
retrieving revision 1.61
diff -u -p -u -r1.61 DNA_userdef_types.h
--- source/blender/makesdna/DNA_userdef_types.h 8 Nov 2006 12:46:41 -0000 1.61
+++ source/blender/makesdna/DNA_userdef_types.h 1 Dec 2006 07:36:26 -0000
@@ -93,13 +93,15 @@ typedef struct ThemeSpace {
char strip[4], strip_select[4];
char vertex_size, facedot_size;
- char bpad[2];
+ char bpad;
char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes
char syntaxv[4], syntaxc[4];
char movie[4], image[4], scene[4], audio[4]; // for sequence editor
char effect[4], plugin[4], transition[4], meta[4];
+
+ char ipovertexsize;
} ThemeSpace;
Index: source/blender/python/api2_2x/doc/Theme.py
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/python/api2_2x/doc/Theme.py,v
retrieving revision 1.9
diff -u -p -u -r1.9 Theme.py
--- source/blender/python/api2_2x/doc/Theme.py 8 Jun 2006 19:05:58 -0000 1.9
+++ source/blender/python/api2_2x/doc/Theme.py 1 Dec 2006 07:36:26 -0000
@@ -205,5 +205,6 @@ class ThemeSpace:
@ivar vertex_size: size of the vertices dots on screen in the range [1, 10].
@type facedot_size: int
@ivar facedot_size: size of the face dots on screen in the range [1, 10].
+ @type ipo_vertex_size: int
+ @ivar ipo_vertex_size: size of the IPO dots on screen in the range [3, 10].
"""
-
Index: source/blender/src/drawipo.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawipo.c,v
retrieving revision 1.88
diff -u -p -u -r1.88 drawipo.c
--- source/blender/src/drawipo.c 30 Nov 2006 02:47:28 -0000 1.88
+++ source/blender/src/drawipo.c 1 Dec 2006 07:36:26 -0000
@@ -1092,7 +1092,7 @@ static void draw_ipovertices(int sel)
if(G.f & G_PICKSEL) return;
- glPointSize(3.0);
+ glPointSize(BIF_GetThemeValuef(TH_IPO_VERTEX_SIZE));
ei= G.sipo->editipo;
for(nr=0; nr<G.sipo->totipo; nr++, ei++) {
@@ -2621,4 +2621,3 @@ EditIpo *select_proj_ipo(rctf *rectf, in
}
return 0;
}
-
Index: source/blender/src/resources.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/resources.c,v
retrieving revision 1.61
diff -u -p -u -r1.61 resources.c
--- source/blender/src/resources.c 28 Oct 2006 13:21:02 -0000 1.61
+++ source/blender/src/resources.c 1 Dec 2006 07:36:26 -0000
@@ -306,6 +306,9 @@ char *BIF_ThemeGetColorPtr(bTheme *bthem
cp= ts->transition; break;
case TH_SEQ_META:
cp= ts->meta; break;
+
+ case TH_IPO_VERTEX_SIZE:
+ cp= &ts->ipovertexsize; break;
}
@@ -416,6 +419,7 @@ void BIF_InitTheme(void)
SETCOL(btheme->tipo.vertex, 0xff, 0x70, 0xff, 255);
SETCOL(btheme->tipo.vertex_select, 0xff, 0xff, 0x70, 255);
SETCOL(btheme->tipo.hilite, 0x60, 0xc0, 0x40, 255);
+ btheme->tipo.ipovertexsize= 3;
/* space file */
/* to have something initialized */
@@ -590,6 +594,7 @@ char *BIF_ThemeColorsPup(int spacetype)
str += sprintf(str, "Ipo Channels %%x%d|", TH_SHADE2);
str += sprintf(str, "Vertex %%x%d|", TH_VERTEX);
str += sprintf(str, "Vertex Selected %%x%d|", TH_VERTEX_SELECT);
+ str += sprintf(str, "Vertex Size %%x%d|", TH_IPO_VERTEX_SIZE);
break;
case SPACE_FILE:
str += sprintf(str, "Selected file %%x%d", TH_HILITE);
Index: source/blender/src/space.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/space.c,v
retrieving revision 1.412
diff -u -p -u -r1.412 space.c
--- source/blender/src/space.c 30 Nov 2006 05:29:05 -0000 1.412
+++ source/blender/src/space.c 1 Dec 2006 07:36:27 -0000
@@ -2675,6 +2675,9 @@ static void info_user_themebuts(uiBlock
else if(th_curcol==TH_FACEDOT_SIZE) {
uiDefButC(block, NUMSLI, B_UPDATE_THEME,"Face dot size ", 465,y3,200,20, col, 1.0, 10.0, 0, 0, "");
}
+ else if(th_curcol==TH_IPO_VERTEX_SIZE) {
+ uiDefButC(block, NUMSLI, B_UPDATE_THEME,"Vertex size ", 465,y3,200,20, col, 3.0, 10.0, 0, 0, "");
+ }
else if(th_curcol==TH_BUT_DRAWTYPE) {
uiBlockBeginAlign(block);
uiDefButC(block, ROW, B_UPDATE_THEME, "Minimal", 465,y3,100,20, col, 2.0, (float) TH_MINIMAL, 0, 0, "");
Index: source/blender/src/usiblender.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/usiblender.c,v
retrieving revision 1.131
diff -u -p -u -r1.131 usiblender.c
--- source/blender/src/usiblender.c 8 Nov 2006 12:46:41 -0000 1.131
+++ source/blender/src/usiblender.c 1 Dec 2006 07:36:27 -0000
@@ -329,6 +329,14 @@ static void init_userdef_file(void)
}
}
+ if (G.main->versionfile <= 242) {
+ bTheme *btheme;
+ for(btheme= U.themes.first; btheme; btheme= btheme->next) {
+ if(btheme->tipo.ipovertexsize == 0) {
+ btheme->tipo.ipovertexsize= 3;
+ }
+ }
+ }
if (U.undosteps==0) U.undosteps=32;

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
c8/af/6879dbb04e731983b61dcc1dcc93

Event Timeline