[Bf-blender-cvs] [87d5f670a0] blender2.8: OpenGL: remove glaDrawBorderCorners
Mike Erwin
noreply at git.blender.org
Fri Mar 3 23:56:05 CET 2017
Commit: 87d5f670a0af2b0fcbf92ef591859cbb0a2a0670
Author: Mike Erwin
Date: Fri Mar 3 17:55:41 2017 -0500
Branches: blender2.8
https://developer.blender.org/rB87d5f670a0af2b0fcbf92ef591859cbb0a2a0670
OpenGL: remove glaDrawBorderCorners
This helper function was marked DEPRECATED since it uses old OpenGL calls.
Part of T49043
===================================================================
M source/blender/editors/include/BIF_glutil.h
M source/blender/editors/screen/glutil.c
===================================================================
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index 3540bcb58a..74c96f46cc 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -282,8 +282,6 @@ void glaDrawImBuf_glsl_ctx_clipping(const struct bContext *C,
float clip_max_x, float clip_max_y,
float zoom_x, float zoom_y);
-void glaDrawBorderCorners(const struct rcti *border, float zoomx, float zoomy);
-
void immDrawBorderCorners(unsigned int pos, const struct rcti *border, float zoomx, float zoomy);
#endif /* __BIF_GLUTIL_H__ */
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index f694fb0ce4..dcf7b1ba20 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -1100,44 +1100,6 @@ void cpack(unsigned int x)
(((x) >> 16) & 0xFF));
}
-void glaDrawBorderCorners(const rcti *border, float zoomx, float zoomy)
-{
- /* DEPRECATED: use immDrawBorderCorners */
- float delta_x = 4.0f * UI_DPI_FAC / zoomx;
- float delta_y = 4.0f * UI_DPI_FAC / zoomy;
-
- delta_x = min_ff(delta_x, border->xmax - border->xmin);
- delta_y = min_ff(delta_y, border->ymax - border->ymin);
-
- /* left bottom corner */
- glBegin(GL_LINE_STRIP);
- glVertex2f(border->xmin, border->ymin + delta_y);
- glVertex2f(border->xmin, border->ymin);
- glVertex2f(border->xmin + delta_x, border->ymin);
- glEnd();
-
- /* left top corner */
- glBegin(GL_LINE_STRIP);
- glVertex2f(border->xmin, border->ymax - delta_y);
- glVertex2f(border->xmin, border->ymax);
- glVertex2f(border->xmin + delta_x, border->ymax);
- glEnd();
-
- /* right bottom corner */
- glBegin(GL_LINE_STRIP);
- glVertex2f(border->xmax - delta_x, border->ymin);
- glVertex2f(border->xmax, border->ymin);
- glVertex2f(border->xmax, border->ymin + delta_y);
- glEnd();
-
- /* right top corner */
- glBegin(GL_LINE_STRIP);
- glVertex2f(border->xmax - delta_x, border->ymax);
- glVertex2f(border->xmax, border->ymax);
- glVertex2f(border->xmax, border->ymax - delta_y);
- glEnd();
-}
-
void immDrawBorderCorners(unsigned int pos, const rcti *border, float zoomx, float zoomy)
{
float delta_x = 4.0f * UI_DPI_FAC / zoomx;
More information about the Bf-blender-cvs
mailing list