archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Three minor fixes;

Browse Source 
- themecolor for the 'bars' in NLA used signed char
- global undo, restore pointers for UI accidentally added user values for
  oops and outliner, causing unused blocks to show used
- moved popup menus one pix up or down, it was overlapping the button
  causing accidental selection of menus
This commit is contained in:
Ton Roosendaal
2004-11-05 17:18:17 +00:00
parent c013711c07
commit e9017926c9
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/src/drawnla.c
View File

@@ -227,18 +227,18 @@ static void draw_nlastrips(SpaceNla *snla)
/* Draw the field */
glEnable (GL_BLEND);
if (TESTBASE_SAFE(base))
glColor4b (col1[0], col1[1], col1[2], 0x22);
glColor4ub (col1[0], col1[1], col1[2], 0x22);
else
glColor4b (col2[0], col2[1], col2[2], 0x22);
glColor4ub (col2[0], col2[1], col2[2], 0x22);
gla2DDrawTranslatePt(di, 1, y, &frame1_x, &channel_y);
glRectf(0, channel_y-NLACHANNELHEIGHT/2, frame1_x, channel_y+NLACHANNELHEIGHT/2);
if (TESTBASE_SAFE(base))
glColor4b (col1[0], col1[1], col1[2], 0x44);
glColor4ub (col1[0], col1[1], col1[2], 0x44);
else
glColor4b (col2[0], col2[1], col2[2], 0x44);
glColor4ub (col2[0], col2[1], col2[2], 0x44);
glRectf(frame1_x, channel_y-NLACHANNELHEIGHT/2, G.v2d->hor.xmax, channel_y+NLACHANNELHEIGHT/2);
glDisable (GL_BLEND);
@@ -251,18 +251,18 @@ static void draw_nlastrips(SpaceNla *snla)
for (conchan=ob->constraintChannels.first; conchan; conchan=conchan->next){
glEnable (GL_BLEND);
if (conchan->flag & CONSTRAINT_CHANNEL_SELECT)
glColor4b (col1[0], col1[1], col1[2], 0x22);
glColor4ub (col1[0], col1[1], col1[2], 0x22);
else
glColor4b (col2[0], col2[1], col2[2], 0x22);
glColor4ub (col2[0], col2[1], col2[2], 0x22);
gla2DDrawTranslatePt(di, 1, y, &frame1_x, &channel_y);
glRectf(0, channel_y-NLACHANNELHEIGHT/2+4, frame1_x, channel_y+NLACHANNELHEIGHT/2-4);
if (conchan->flag & CONSTRAINT_CHANNEL_SELECT)
glColor4b (col1[0], col1[1], col1[2], 0x44);
glColor4ub (col1[0], col1[1], col1[2], 0x44);
else
glColor4b (col2[0], col2[1], col2[2], 0x44);
glColor4ub (col2[0], col2[1], col2[2], 0x44);
glRectf(frame1_x, channel_y-NLACHANNELHEIGHT/2+4, G.v2d->hor.xmax, channel_y+NLACHANNELHEIGHT/2-4);
glDisable (GL_BLEND);