[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50046] branches/soc-2012-swiss_cheese/ source/blender/editors: Added missing gpuImmediateFormat/ gpuImmediateUnformat for knife tool and proportional edit

[Jason Wilkins]

Revision: 50046
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50046
Author:   jwilkins
Date:     2012-08-20 14:03:19 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Added missing gpuImmediateFormat/gpuImmediateUnformat for knife tool and proportional edit

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_constraints.c

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_knife.c	2012-08-20 14:01:16 UTC (rev 50045)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_knife.c	2012-08-20 14:03:19 UTC (rev 50046)
@@ -913,6 +913,8 @@
 
 	glPolygonOffset(1.0f, 1.0f);
 
+	gpuImmediateFormat_V3();
+
 	gpuPushMatrix();
 	gpuMultMatrix(kcd->ob->obmat);
 
@@ -1048,6 +1050,8 @@
 
 	gpuPopMatrix();
 
+	gpuImmediateUnformat();
+
 	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
 }
 

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_constraints.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_constraints.c	2012-08-20 14:01:16 UTC (rev 50045)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_constraints.c	2012-08-20 14:03:19 UTC (rev 50046)
@@ -665,7 +665,7 @@
 		}
 
 		set_inverted_drawing(1);
-		gpuDrawFastBall(GL_LINE_LOOP, center, t->prop_size, imat);
+		gpuSingleFastBall(GL_LINE_LOOP, center, t->prop_size, imat);
 		set_inverted_drawing(0);
 
 		gpuPopMatrix();