Moving the find panel caused some funky projection effect, introduced when I fixed the scrollbar. The scrollbar and panel now play nice.

1 files changed, 7 insertions, 12 deletions

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 5a4d5feaa16..0c8e96f89fc 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1111,10 +1111,8 @@ static void do_textscroll(SpaceText *st, int mode)
 
 	st->flags|= ST_SCROLL_SELECT;
 
-	glDrawBuffer(GL_FRONT);
-	uiEmboss(st->txtbar.xmin, st->txtbar.ymin, st->txtbar.xmax, st->txtbar.ymax, st->flags & ST_SCROLL_SELECT);
-	bglFlush();
-	glDrawBuffer(GL_BACK);
+	scrarea_do_windraw(curarea);
+	screen_swapbuffers();
 
 	getmouseco_areawin(mval);
 	old[0]= hold[0]= mval[0];
@@ -1152,10 +1150,8 @@ static void do_textscroll(SpaceText *st, int mode)
 	}
 	st->flags^= ST_SCROLL_SELECT;
 
-	glDrawBuffer(GL_FRONT);
-	uiEmboss(st->txtbar.xmin, st->txtbar.ymin, st->txtbar.xmax, st->txtbar.ymax, st->flags & ST_SCROLL_SELECT);
-	bglFlush();
-	glDrawBuffer(GL_BACK);
+	scrarea_do_windraw(curarea);
+	screen_swapbuffers();
 }
 
 static void do_selection(SpaceText *st, int selecting)
@@ -1626,6 +1622,9 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	int linecount = 0;
 
 	if (st==NULL || st->spacetype != SPACE_TEXT) return;
+
+	bwin_clear_viewmat(sa->win);	/* clear buttons view */
+	glLoadIdentity();
 	
 	BIF_GetThemeColor3fv(TH_BACK, col);
 	glClearColor(col[0], col[1], col[2], 0.0);
@@ -1701,10 +1700,6 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	
 	bwin_scalematrix(sa->win, st->blockscale, st->blockscale, st->blockscale);
 	text_blockhandlers(sa);
-
-	/* We end here in non-buttons scale so that the scrollbar can be drawn correctly */
-	bwin_clear_viewmat(sa->win);	/* clear buttons view */
-	glLoadIdentity();
 	
 	curarea->win_swap= WIN_BACK_OK;
 }