[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47567] branches/soc-2012-swiss_cheese/ source/blender/editors/transform/transform_manipulator.c: Fixed unbalaned Format/Unformat and removed dead references to GLU

[Jason Wilkins]

Revision: 47567
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47567
Author:   jwilkins
Date:     2012-06-07 09:29:06 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
Fixed unbalaned Format/Unformat and removed dead references to GLU

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_manipulator.c

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_manipulator.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_manipulator.c	2012-06-07 09:11:16 UTC (rev 47566)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_manipulator.c	2012-06-07 09:29:06 UTC (rev 47567)
@@ -1327,15 +1327,13 @@
 	glFrontFace(GL_CCW);
 }
 
-static void draw_cone(GLUquadricObj *qobj, float len, float width)
+static void draw_cone(float len, float width)
 {
 	gpuDrawCone(len, width, 8, GL_TRUE);
-	gpuDrawDisk(0, 0, width, 8);
 }
 
 static void draw_manipulator_translate(View3D *v3d, RegionView3D *rv3d, int UNUSED(moving), int drawflags, int combo, int colcode)
 {
-	GLUquadricObj *qobj;
 	float cylen= 0.01f*(float)U.tw_handlesize;
 	float cywid= 0.25f*cylen, dz, size;
 	int shift= 0; // XXX
@@ -1346,9 +1344,6 @@
 	// XXX if (moving) glTranslatef(t->vec[0], t->vec[1], t->vec[2]);
 	glDisable(GL_DEPTH_TEST);
 
-	qobj= gluNewQuadric();
-	gluQuadricDrawStyle(qobj, GLU_FILL);
-
 	/* center circle, do not add to selection when shift is pressed (planar constraint) */
 	if ( (G.f & G_PICKSEL) && shift==0) {
 		glLoadName(MAN_TRANS_C);
@@ -1430,7 +1425,6 @@
 		glPopMatrix();
 	}
 
-	gluDeleteQuadric(qobj);
 	glLoadMatrixf(rv3d->viewmat);
 
 	if (v3d->zbuf) {
@@ -1463,8 +1457,12 @@
 		v3d->twflag &= ~V3D_DRAW_MANIPULATOR;
 
 		totsel= calc_manipulator_stats(C);
-		if (totsel==0) return;
 
+		if (totsel==0) {
+			gpuImmediateUnformat();
+			return;
+		}
+
 		v3d->twflag |= V3D_DRAW_MANIPULATOR;
 
 		/* now we can define center */