griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix glitch in view-axis (order of drawing)

Browse Source
This commit is contained in:
Campbell Barton
2015-01-20 16:37:07 +11:00
parent 289960787e
commit 1d56f456f7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -586,20 +586,26 @@ static void draw_view_axis(RegionView3D *rv3d, rcti *rect)
float ydisp = 0.0; /* vertical displacement to allow obj info text */
int bright = - 20 * (10 - U.rvibright); /* axis alpha offset (rvibright has range 0-10) */
float vec[3];
char axis_text[2] = "x";
float dx, dy;
int i;
int axis_order[3] = {0, 1, 2};
int axis_i;
startx += rect->xmin;
starty += rect->ymin;
axis_sort_v3(rv3d->viewinv[2], axis_order);
/* thickness of lines is proportional to k */
glLineWidth(2);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
for (i = 0; i < 3; i++) {
for (axis_i = 0; axis_i < 3; axis_i++) {
int i = axis_order[axis_i];
const char axis_text[2] = {'x' + i, '\0'};
zero_v3(vec);
vec[i] = 1.0f;
mul_qt_v3(rv3d->viewquat, vec);
@@ -616,8 +622,6 @@ static void draw_view_axis(RegionView3D *rv3d, rcti *rect)
BLF_draw_default_ascii(startx + dx + 2, starty + dy + ydisp + 2, 0.0f, axis_text, 1);
}
axis_text[0]++;
/* BLF_draw_default disables blending */
glEnable(GL_BLEND);
}