OpenGL immediate mode: Convert leftover UI_ThemeColor calls
Some `UI_ThemeColor` calls were left in converted files, in some cases because they were just overlooked, and in the case of text drawing, because the new BLF color functions were not yet implemented at the time of conversion. Also converted one `drawcircball` call that was left in transform_constraints.c Part of T49043
This commit is contained in:
parent
3f9f82f3c4
commit
8fbf1c4d77
|
@ -3907,6 +3907,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
|
|||
|
||||
/* set text color */
|
||||
/* XXX: if active, highlight differently? */
|
||||
|
||||
if (selected)
|
||||
UI_GetThemeColor4ubv(TH_TEXT_HI, col);
|
||||
else
|
||||
|
|
|
@ -1882,7 +1882,7 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
|
|||
}
|
||||
if (vs->xunits == V2D_UNIT_FRAMES)
|
||||
grid->powerx = 1;
|
||||
|
||||
|
||||
/* draw numbers in the appropriate range */
|
||||
if (dfac > 0.0f) {
|
||||
float h = 0.1f * UI_UNIT_Y + (float)(hor.ymin);
|
||||
|
|
|
@ -236,7 +236,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
|
|||
case ANIMTYPE_SUMMARY:
|
||||
{
|
||||
/* reddish color from NLA */
|
||||
UI_ThemeColor4(TH_ANIM_ACTIVE);
|
||||
immUniformThemeColor(TH_ANIM_ACTIVE);
|
||||
break;
|
||||
}
|
||||
case ANIMTYPE_SCENE:
|
||||
|
|
|
@ -340,7 +340,7 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
|
|||
v2d->cur.xmax + EXTRA_SCROLL_PAD, (float) y + CHANNEL_HEIGHT_HALF);
|
||||
immUnbindProgram();
|
||||
|
||||
UI_ThemeColor(sel ? TH_TEXT_HI : TH_TEXT);
|
||||
UI_FontThemeColor(fontid, sel ? TH_TEXT_HI : TH_TEXT);
|
||||
|
||||
font_height = BLF_height(fontid, channel->name, sizeof(channel->name));
|
||||
BLF_position(fontid, v2d->cur.xmin + CHANNEL_PAD,
|
||||
|
|
|
@ -769,8 +769,6 @@ void drawPropCircle(const struct bContext *C, TransInfo *t)
|
|||
float tmat[4][4], imat[4][4];
|
||||
int depth_test_enabled;
|
||||
|
||||
UI_ThemeColor(TH_GRID);
|
||||
|
||||
if (t->spacetype == SPACE_VIEW3D && rv3d != NULL) {
|
||||
copy_m4_m4(tmat, rv3d->viewmat);
|
||||
invert_m4_m4(imat, tmat);
|
||||
|
@ -803,10 +801,17 @@ void drawPropCircle(const struct bContext *C, TransInfo *t)
|
|||
if (depth_test_enabled)
|
||||
glDisable(GL_DEPTH_TEST);
|
||||
|
||||
unsigned int pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 3, KEEP_FLOAT);
|
||||
|
||||
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
|
||||
immUniformThemeColor(TH_GRID);
|
||||
|
||||
set_inverted_drawing(1);
|
||||
drawcircball(GL_LINE_LOOP, t->center_global, t->prop_size, imat);
|
||||
imm_drawcircball(t->center_global, t->prop_size, imat, pos);
|
||||
set_inverted_drawing(0);
|
||||
|
||||
immUnbindProgram();
|
||||
|
||||
if (depth_test_enabled)
|
||||
glEnable(GL_DEPTH_TEST);
|
||||
|
||||
|
|
Loading…
Reference in New Issue