[Bf-blender-cvs] [54b992a] master: Fix glLineWidth state use w/ grid floor and brush
Campbell Barton
noreply at git.blender.org
Sun Jan 24 10:40:09 CET 2016
Commit: 54b992ae6159d0bf788adaa5d585d82d17333f1e
Author: Campbell Barton
Date: Sun Jan 24 20:30:41 2016 +1100
Branches: master
https://developer.blender.org/rB54b992ae6159d0bf788adaa5d585d82d17333f1e
Fix glLineWidth state use w/ grid floor and brush
===================================================================
M source/blender/editors/sculpt_paint/paint_cursor.c
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 2f4dc54..2ba0797 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -1064,6 +1064,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
}
/* make lines pretty */
+ glLineWidth(1.0f);
glEnable(GL_BLEND);
glEnable(GL_LINE_SMOOTH);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index cb9e0d1..c37d90b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -304,6 +304,8 @@ static void drawgrid(UnitSettings *unit, ARegion *ar, View3D *v3d, const char **
dx = fabs(x - (wx) * fx / fw);
if (dx == 0) dx = fabs(y - (wy) * fy / fw);
+ glLineWidth(1.0f);
+
glDepthMask(GL_FALSE); /* disable write in zbuffer */
/* check zoom out */
More information about the Bf-blender-cvs
mailing list