kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

edit fix for [#32177] - drawing text isnt really needed for selections.

Browse Source
This commit is contained in:
Campbell Barton 2012-07-25 13:55:16 +00:00
parent 1091030c11
commit d417cdc9f4
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/space_view3d/drawobject.c
View File

@ -6447,19 +6447,6 @@ static void draw_rigid_body_pivot(bRigidBodyJointConstraint *data, const short d
const char *axis_str[3] = {"px", "py", "pz"}; const char *axis_str[3] = {"px", "py", "pz"};
int axis; int axis;
float mat[4][4]; float mat[4][4];
unsigned char _col[4], *col;
/* color */
if (dflag & DRAW_CONSTCOLOR) {
/* so we can draw pivot point in current const color */
float tcol[4];
col = _col;
glGetFloatv(GL_CURRENT_COLOR, tcol);
rgb_float_to_uchar(col, tcol);
}
else {
col = ob_wire_col;
}
eul_to_mat4(mat, &data->axX); eul_to_mat4(mat, &data->axX);
glLineWidth(4.0f); glLineWidth(4.0f);
@ -6470,7 +6457,7 @@ static void draw_rigid_body_pivot(bRigidBodyJointConstraint *data, const short d
copy_v3_v3(v, &data->pivX); copy_v3_v3(v, &data->pivX);
dir[axis] = 1.f; dir[axis] = 1.0f;
glBegin(GL_LINES); glBegin(GL_LINES);
mul_m4_v3(mat, dir); mul_m4_v3(mat, dir);
add_v3_v3(v, dir); add_v3_v3(v, dir);
@ -6478,7 +6465,11 @@ static void draw_rigid_body_pivot(bRigidBodyJointConstraint *data, const short d
glVertex3fv(v); glVertex3fv(v);
glEnd(); glEnd();
view3d_cached_text_draw_add(v, axis_str[axis], 0, V3D_CACHE_TEXT_ASCII, col); /* when const color is set wirecolor is NULL - we could get the current color but
* with selection and group instancing its not needed to draw the text */
if ((dflag & DRAW_CONSTCOLOR) == 0) {
view3d_cached_text_draw_add(v, axis_str[axis], 0, V3D_CACHE_TEXT_ASCII, ob_wire_col);
}
} }
glLineWidth(1.0f); glLineWidth(1.0f);
setlinestyle(0); setlinestyle(0);