Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2016-01-23 08:58:32 +0300
committerMike Erwin <significant.bit@gmail.com>2016-01-23 08:58:51 +0300
commite25ba162c0b62b19cf367f0f29e29d0c0960978d (patch)
tree6f274502a6fb22b1679decca4b944e09fab29137 /source/blender/editors/space_clip/clip_draw.c
parent90293a8da375b785fa58d3f56de1b286072107c1 (diff)
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.
Diffstat (limited to 'source/blender/editors/space_clip/clip_draw.c')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c15
1 files changed, 2 insertions, 13 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();