diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-11-05 20:18:17 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-11-05 20:18:17 +0300 |
| commit | e9017926c90e71544798bd14a543043cdff824d7 (patch) | |
| tree | b4e3507a2444498930185e573600c95888b7cc34 /source/blender/src/drawnla.c | |
| parent | c013711c073e7a6e9470c34f6bac73c9af12c3a9 (diff) | |
Three minor fixes;
- 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
Diffstat (limited to 'source/blender/src/drawnla.c')
| -rw-r--r-- | source/blender/src/drawnla.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index d95254a4c22..f4da9655c5a 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -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); |