delete deprecated fdrawXORcirc function
authorMike Erwin <significant.bit@gmail.com>
Thu, 17 Nov 2016 20:03:55 +0000 (15:03 -0500)
committerMike Erwin <significant.bit@gmail.com>
Thu, 17 Nov 2016 20:03:55 +0000 (15:03 -0500)
Only one place used it, and that place was dead code already.

source/blender/editors/include/BIF_glutil.h
source/blender/editors/screen/glutil.c
source/blender/editors/space_image/image_draw.c

index e34d9517c11e5241c45a95ac0df6a40e1eb903bf..25fcdf33524c30df4cbafe393c2af2d0280f2611 100644 (file)
@@ -52,8 +52,6 @@ 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 fdrawXORcirc(float xofs, float yofs, float rad); /* DEPRECATED */
-
 void fdrawcheckerboard(float x1, float y1, float x2, float y2); /* DEPRECATED */
 
 /* OpenGL stipple defines */
index 3e198238555848c3cfc5f2372aff88f0db255f11..d719542e23ae8fdfa291e8755c7a3d581bb36071 100644 (file)
@@ -139,17 +139,6 @@ void set_inverted_drawing(int enable)
        GL_TOGGLE(GL_DITHER, !enable);
 }
 
-void fdrawXORcirc(float xofs, float yofs, float rad)
-{
-       set_inverted_drawing(1);
-
-       glPushMatrix();
-       glTranslatef(xofs, yofs, 0.0);
-       glutil_draw_lined_arc(0.0, M_PI * 2.0, rad, 20);
-       glPopMatrix();
-
-       set_inverted_drawing(0);
-}
 
 void glutil_draw_filled_arc(float start, float angle, float radius, int nsegments)
 {
index e810f4db7dd9f1f244fd34bf126526335e093978..dd575619c0fe4a6a33a4aba2ac50a5c82c884ef2 100644 (file)
@@ -718,39 +718,6 @@ void draw_image_sample_line(SpaceImage *sima)
        }
 }
 
-/* XXX becomes WM paint cursor */
-#if 0
-static void draw_image_view_tool(Scene *scene)
-{
-       ToolSettings *settings = scene->toolsettings;
-       Brush *brush = settings->imapaint.brush;
-       int mval[2];
-       float radius;
-       int draw = 0;
-
-       if (brush) {
-               if (settings->imapaint.flag & IMAGEPAINT_DRAWING) {
-                       if (settings->imapaint.flag & IMAGEPAINT_DRAW_TOOL_DRAWING)
-                               draw = 1;
-               }
-               else if (settings->imapaint.flag & IMAGEPAINT_DRAW_TOOL)
-                       draw = 1;
-               
-               if (draw) {
-                       getmouseco_areawin(mval);
-
-                       radius = BKE_brush_size_get(brush) * G.sima->zoom;
-                       fdrawXORcirc(mval[0], mval[1], radius);
-
-                       if (brush->innerradius != 1.0) {
-                               radius *= brush->innerradius;
-                               fdrawXORcirc(mval[0], mval[1], radius);
-                       }
-               }
-       }
-}
-#endif
-
 static unsigned char *get_alpha_clone_image(const bContext *C, Scene *scene, int *width, int *height)
 {
        Brush *brush = BKE_paint_brush(&scene->toolsettings->imapaint.paint);