From 31e4149c44780cffd13d3609a7beccf7e6f69822 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Thu, 4 Jan 2007 07:03:00 +0000 Subject: [PATCH] Reverted my fix for bug #5539, brush circle cursor is slow. The fix was causing more sculptmode drawing artifacts for some users. Since this is a non-critical performance related bug, it can wait until after 2.43. --- source/blender/src/drawview.c | 4 +++- source/blender/src/sculptmode.c | 4 +++- source/blender/src/space.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index c5bd7a75a2d..23ec24a13d0 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -2817,7 +2817,9 @@ void drawview3dspace(ScrArea *sa, void *spacedata) sdrawXORline(pd->origloc[0], pd->origloc[1], mouse[0], mouse[1]); } } else { - sculpt_paint_brush(1); + short c[2]; + getmouseco_areawin(c); + fdrawXORcirc((float)c[0], (float)c[1], sculptmode_brush()->size); } } retopo_draw_paint_lines(); diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c index 5ac55cedbe1..e7258e29215 100644 --- a/source/blender/src/sculptmode.c +++ b/source/blender/src/sculptmode.c @@ -1970,7 +1970,9 @@ void sculpt() glEnable(GL_SCISSOR_TEST); /* Draw cursor */ - sculpt_paint_brush(1); + persp(PERSP_WIN); + glDisable(GL_DEPTH_TEST); + fdrawXORcirc((float)mouse[0],(float)mouse[1],sculptmode_brush()->size); myswapbuffers(); } diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 0e305ff2dc0..8b41dcd79c0 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1074,7 +1074,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) } else if(event!=LEFTMOUSE && event!=MIDDLEMOUSE && (event==MOUSEY || event==MOUSEX)) { if(!bwin_qtest(sa->win)) - sculpt_paint_brush(0); + allqueue(REDRAWVIEW3D, 0); } }