OpenGL: call glLineWidth less often

Each LINES draw call is now responsible for its own line width. No need
to set it back to its 1.0 default after every draw.

This eliminates half our calls to glLineWidth , similar to last week’s
work on glPointSize.

3 files changed, 2 insertions, 18 deletions

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index a4dc71dfb83..6542a4d1c0c 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -439,7 +439,6 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 		for (i = a; i < b; i++)
 			glVertex2f(path[i][0], path[i][1]);
 		glEnd();
-		glLineWidth(1.0f);
 	}
 
 	UI_ThemeColor(TH_PATH_BEFORE);
@@ -459,6 +458,8 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 
 	UI_ThemeColor(TH_PATH_BEFORE);
 
+	glLineWidth(1);
+
 	glBegin(GL_LINE_STRIP);
 	for (i = a; i < b; i++) {
 		if (i == count + 1)
@@ -515,7 +516,6 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 			glVertex2f(pos[0], pos[1] + px[1] * 2);
 			glVertex2f(pos[0], pos[1] + px[1] * 8);
 			glEnd();
-			if (!tiny) glLineWidth(1.0f);
 		}
 	}
 
@@ -543,9 +543,6 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 		glEnd();
 	}
 	glPopMatrix();
-
-	if (!tiny)
-		glLineWidth(1.0f);
 }
 
 static void track_colors(MovieTrackingTrack *track, int act, float col[3], float scol[3])
@@ -886,9 +883,6 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 	}
 
 	glPopMatrix();
-
-	if (outline)
-		glLineWidth(1.0f);
 }
 
 static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
@@ -1192,9 +1186,6 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane
 
 		if (stipple)
 			glDisable(GL_LINE_STIPPLE);
-		
-		if (thick)
-			glLineWidth(1.0f);
 	}
 
 	/* Draw sliders. */
@@ -1663,8 +1654,6 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 
 			layer = layer->next;
 		}
-
-		glLineWidth(1.0f);
 	}
 
 	glPopMatrix();
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c
index 2c3b8acf672..424d25defdd 100644
--- a/source/blender/editors/space_clip/clip_graph_draw.c
+++ b/source/blender/editors/space_clip/clip_graph_draw.c
@@ -115,8 +115,6 @@ static void tracking_segment_start_cb(void *userdata, MovieTrackingTrack *track,
 static void tracking_segment_end_cb(void *UNUSED(userdata), int UNUSED(coord))
 {
 	glEnd();
-
-	glLineWidth(1.0f);
 }
 
 typedef struct TrackMotionCurveUserData {
@@ -261,7 +259,6 @@ static void tracking_error_segment_end_cb(void *UNUSED(userdata), int coord)
 {
 	if (coord == 1) {
 		glEnd();
-		glLineWidth(1.0f);
 	}
 }
 
diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c
index 034429f6992..5964e9a898b 100644
--- a/source/blender/editors/space_clip/clip_utils.c
+++ b/source/blender/editors/space_clip/clip_utils.c
@@ -260,8 +260,6 @@ void clip_draw_cfra(SpaceClip *sc, ARegion *ar, Scene *scene)
 	glVertex2f(x, v2d->cur.ymax);
 	glEnd();
 
-	glLineWidth(1.0);
-
 	UI_view2d_view_orthoSpecial(ar, v2d, 1);
 
 	/* because the frame number text is subject to the same scaling as the contents of the view */