Revision: 48286
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48286
Author: jwilkins
Date: 2012-06-25 19:06:45 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
gpu safety fix, screen join shape was not properly locked
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
2012-06-25 18:44:59 UTC (rev 48285)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
2012-06-25 19:06:45 UTC (rev 48286)
@@ -851,17 +851,21 @@
gpuVertex2f(points[0].x, points[0].y);
gpuEnd();
- gpuSingleFilledRectf(points[2].x, points[2].y, points[8].x,
points[8].y);
- gpuSingleFilledRectf(points[6].x, points[6].y, points[9].x,
points[9].y);
+ gpuDrawFilledRectf(points[2].x, points[2].y, points[8].x, points[8].y);
+ gpuDrawFilledRectf(points[6].x, points[6].y, points[9].x, points[9].y);
}
/* draw join shape due to direction of joining */
static void draw_join_shape(ScrArea *sa, char dir)
{
+ gpuImmediateFormat_V2();
+
if (dir == 'u' || dir == 'd')
draw_vertical_join_shape(sa, dir);
else
draw_horizontal_join_shape(sa, dir);
+
+ gpuImmediateUnformat();
}
/* draw screen area darker with arrow (visualisation of future joining) */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
