[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32707] trunk/blender/source/blender/ editors/interface/interface_draw.c: curve widget bounds were not properly clipped causing drawing artifacts in other views .
Campbell Barton
ideasman42 at gmail.com
Mon Oct 25 20:12:28 CEST 2010
Revision: 32707
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32707
Author: campbellbarton
Date: 2010-10-25 20:12:28 +0200 (Mon, 25 Oct 2010)
Log Message:
-----------
curve widget bounds were not properly clipped causing drawing artifacts in other views.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_draw.c
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c 2010-10-25 17:20:12 UTC (rev 32706)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c 2010-10-25 18:12:28 UTC (rev 32707)
@@ -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 @@
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 @@
/* 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);
More information about the Bf-blender-cvs
mailing list