archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

curve widget bounds were not properly clipped causing drawing artifacts in other views.

Browse Source
This commit is contained in:
Campbell Barton
2010-10-25 18:12:28 +00:00
parent 7869c7ee85
commit 82fd7f21fc
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/interface/interface_draw.c
View File

@@ -33,6 +33,7 @@
#include "DNA_screen_types.h"
#include "BLI_math.h"
#include "BLI_rect.h"
#include "BKE_colortools.h"
#include "BKE_texture.h"
@@ -1355,6 +1356,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *rect
CurveMapPoint *cmp;
float fx, fy, fac[2], zoomx, zoomy, offsx, offsy;
GLint scissor[4];
rcti scissor_new;
int a;
cumap= (CurveMapping *)(but->editcumap? but->editcumap: but->poin);
@@ -1362,7 +1364,12 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *rect
/* need scissor test, curve can draw outside of boundary */
glGetIntegerv(GL_VIEWPORT, scissor);
glScissor(ar->winrct.xmin + rect->xmin, ar->winrct.ymin+rect->ymin, rect->xmax-rect->xmin, rect->ymax-rect->ymin);
scissor_new.xmin= ar->winrct.xmin + rect->xmin;
scissor_new.ymin= ar->winrct.ymin + rect->ymin;
scissor_new.xmax= ar->winrct.xmin + rect->xmax;
scissor_new.ymax= ar->winrct.ymin + rect->ymax;
BLI_isect_rcti(&scissor_new, &ar->winrct, &scissor_new);
glScissor(scissor_new.xmin, scissor_new.ymin, scissor_new.xmax-scissor_new.xmin, scissor_new.ymax-scissor_new.ymin);
/* calculate offset and zoom */
zoomx= (rect->xmax-rect->xmin-2.0*but->aspect)/(cumap->curr.xmax - cumap->curr.xmin);