blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-22 12:40:02 +10:00
parent 8f21f867e7 1b994a37f4
commit 3aacd8a4ab
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_console/console_draw.c
View File

@ -142,10 +142,7 @@ static void console_cursor_wrap_offset(
return;
}
static void console_textview_draw_cursor(TextViewContext *tvc,
int cwidth,
int columns,
int descender)
static void console_textview_draw_cursor(TextViewContext *tvc, int cwidth, int columns)
{
int pen[2];
{
@ -171,8 +168,7 @@ static void console_textview_draw_cursor(TextViewContext *tvc,
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformThemeColor(TH_CONSOLE_CURSOR);
immRectf(
pos, pen[0] - U.pixelsize, pen[1], pen[0] + U.pixelsize, pen[1] + tvc->lheight + descender);
immRectf(pos, pen[0] - U.pixelsize, pen[1], pen[0] + U.pixelsize, pen[1] + tvc->lheight);
immUnbindProgram();
}

2
source/blender/editors/space_info/textview.c
View File

@ -408,7 +408,7 @@ int textview_draw(TextViewContext *tvc,
if (do_draw) {
/* We always want the cursor to draw. */
if (tvc->draw_cursor && iter_index == 0) {
tvc->draw_cursor(tvc, tds.cwidth, tds.columns, tds.lofs);
tvc->draw_cursor(tvc, tds.cwidth, tds.columns);
}
/* When drawing, if we pass v2d->cur.ymax, then quit. */

2
source/blender/editors/space_info/textview.h
View File

@ -60,7 +60,7 @@ typedef struct TextViewContext {
int *r_icon,
uchar r_icon_fg[4],
uchar r_icon_bg[4]);
void (*draw_cursor)(struct TextViewContext *tvc, int cwidth, int columns, int descender);
void (*draw_cursor)(struct TextViewContext *tvc, int cwidth, int columns);
/* constant theme colors */
void (*const_colors)(struct TextViewContext *tvc, unsigned char bg_sel[4]);
const void *iter;