[Bf-blender-cvs] [3381cf98cb] blender2.8: OpenGL: remove fdrawbox, sdrawbox, sdrawline
Mike Erwin
noreply at git.blender.org
Fri Mar 3 19:27:30 CET 2017
Commit: 3381cf98cb3ea4a5e606627dbeb25b83b808da23
Author: Mike Erwin
Date: Fri Mar 3 13:26:43 2017 -0500
Branches: blender2.8
https://developer.blender.org/rB3381cf98cb3ea4a5e606627dbeb25b83b808da23
OpenGL: remove fdrawbox, sdrawbox, sdrawline
These helper functions were marked DEPRECATED since they use old OpenGL calls. Now they are marked GONE!
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 a0e47a7a22..206df852fb 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -48,9 +48,6 @@ struct ColorManagedDisplaySettings;
*/
void fdrawline(float x1, float y1, float x2, float y2); /* DEPRECATED */
-void fdrawbox(float x1, float y1, float x2, float y2); /* DEPRECATED */
-void sdrawline(int x1, int y1, int x2, int y2); /* DEPRECATED */
-void sdrawbox(int x1, int y1, int x2, int y2); /* DEPRECATED */
void fdrawcheckerboard(float x1, float y1, float x2, float y2); /* DEPRECATED */
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index 15e6525cd2..ac97321ae1 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -62,19 +62,6 @@ void fdrawline(float x1, float y1, float x2, float y2)
glEnd();
}
-void fdrawbox(float x1, float y1, float x2, float y2)
-{
- /* DEPRECATED: use imm_draw_line_box instead */
- glBegin(GL_LINE_LOOP);
-
- glVertex2f(x1, y1);
- glVertex2f(x1, y2);
- glVertex2f(x2, y2);
- glVertex2f(x2, y1);
-
- glEnd();
-}
-
void fdrawcheckerboard(float x1, float y1, float x2, float y2)
{
/* DEPRECATED: use imm_draw_checker_box instead */
@@ -90,27 +77,6 @@ void fdrawcheckerboard(float x1, float y1, float x2, float y2)
GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
}
-void sdrawline(int x1, int y1, int x2, int y2) /* DEPRECATED */
-{
- glBegin(GL_LINES);
- glVertex2i(x1, y1);
- glVertex2i(x2, y2);
- glEnd();
-}
-
-void sdrawbox(int x1, int y1, int x2, int y2)
-{
- /* DEPRECATED: use imm_draw_line_box instead */
- glBegin(GL_LINE_LOOP);
-
- glVertex2i(x1, y1);
- glVertex2i(x1, y2);
- glVertex2i(x2, y2);
- glVertex2i(x2, y1);
-
- glEnd();
-}
-
/* ******************************************** */
More information about the Bf-blender-cvs
mailing list