[Bf-blender-cvs] [0fb26a9] wiggly-widgets: More Adjustments to manipulator widget drawing

Julian Eisel noreply at git.blender.org
Tue Aug 18 01:30:32 CEST 2015


Commit: 0fb26a94f50c115bd829d99dc91b7c0e2f8e28cf
Author: Julian Eisel
Date:   Tue Aug 18 01:29:44 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB0fb26a94f50c115bd829d99dc91b7c0e2f8e28cf

More Adjustments to manipulator widget drawing

===================================================================

M	source/blender/windowmanager/intern/wm_generic_widgets.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_generic_widgets.c b/source/blender/windowmanager/intern/wm_generic_widgets.c
index 3bfc81c..00807f0 100644
--- a/source/blender/windowmanager/intern/wm_generic_widgets.c
+++ b/source/blender/windowmanager/intern/wm_generic_widgets.c
@@ -79,6 +79,8 @@
 /* to use custom dials exported to arrow_widget.c */
 //#define WIDGET_USE_CUSTOM_DIAS
 
+#define WIDGET_LINE_WIDTH 2.0
+
 
 float highlight_col[] = {1.0f, 1.0f, 0.45f, 1.0f};
 
@@ -205,13 +207,15 @@ static void arrow_draw_geom(ArrowWidget *arrow, bool select)
 		widget_draw_intern(&arraw_head_draw_info, select);
 #else
 		GLUquadricObj *qobj = gluNewQuadric();
-		const float len = 0.3f;
-		const float width = 0.05f;
+		const float len = 0.25f;
+		const float width = 0.06f;
 
+		glLineWidth(WIDGET_LINE_WIDTH);
 		glBegin(GL_LINES);
 		glVertex3f(0.0, 0.0, 0.0);
 		glVertex3f(0.0, 0.0, 1.0);
 		glEnd();
+		glLineWidth(1.0);
 
 		gluQuadricDrawStyle(qobj, GLU_FILL);
 		glTranslatef(0.0, 0.0, 1.0);
@@ -552,8 +556,10 @@ static void dial_draw_geom(const bool select)
 	(void)qobj; (void)width; (void)resol;
 #else
 
+	glLineWidth(WIDGET_LINE_WIDTH);
 	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
 	gluDisk(qobj, 0.0, width, resol, 1);
+	glLineWidth(1.0);
 
 	(void)select;
 #endif




More information about the Bf-blender-cvs mailing list