[Bf-blender-cvs] [aee3560cce6] blender2.8: Followup to previous merge conflict resolution

Sergey Sharybin noreply at git.blender.org
Mon Dec 4 15:26:22 CET 2017


Commit: aee3560cce62d9b11e2184f1616451247eed1d97
Author: Sergey Sharybin
Date:   Mon Dec 4 15:26:06 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBaee3560cce62d9b11e2184f1616451247eed1d97

Followup to previous merge conflict resolution

===================================================================

M	source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index b06c0031e71..fd549748bce 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -9497,7 +9497,7 @@ static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *dm, int offset)
 
 	immBindBuiltinProgram(GPU_SHADER_3D_FLAT_COLOR_U32);
 
-	glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
+	glLineWidth(1);
 
 	immBeginAtMost(GWN_PRIM_LINES, imm_len);
 	dm->foreachMappedEdge(dm, bbs_mesh_wire__mapFunc, &data);



More information about the Bf-blender-cvs mailing list