[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32600] trunk/blender/source/blender/ editors: fix for previous commit.

[Campbell Barton]

Revision: 32600
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32600
Author:   campbellbarton
Date:     2010-10-19 15:35:21 +0200 (Tue, 19 Oct 2010)

Log Message:
-----------
fix for previous commit. also noticed theres no need for UI_make_axis_color() to check upper and lower case.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2010-10-19 13:04:40 UTC (rev 32599)
+++ trunk/blender/source/blender/editors/interface/resources.c	2010-10-19 13:35:21 UTC (rev 32600)
@@ -956,13 +956,11 @@
 	switch(axis)
 	{
 		case 'x':
-		case 'X':
 			dst_col[0]= src_col[0]>219?255:src_col[0]+36;
 			dst_col[1]= src_col[1]<26?0:src_col[1]-26;
 			dst_col[2]= src_col[2]<26?0:src_col[2]-26;
 			break;
 		case 'y':
-		case 'Y':
 			dst_col[0]= src_col[0]<46?0:src_col[0]-36;
 			dst_col[1]= src_col[1]>189?255:src_col[1]+66;
 			dst_col[2]= src_col[2]<46?0:src_col[2]-36;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2010-10-19 13:04:40 UTC (rev 32599)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2010-10-19 13:35:21 UTC (rev 32600)
@@ -594,7 +594,7 @@
 	dy = vec[1] * k;
 
 	glColor3ub(220, 0, 0);
-	glBegin(GL_LINE);
+	glBegin(GL_LINES);
 	glVertex2f(start, start + ydisp);
 	glVertex2f(start + dx, start + dy + ydisp);
 	glEnd();
@@ -611,7 +611,7 @@
 	dy = vec[1] * k;
 
 	glColor3ub(0, 220, 0);
-	glBegin(GL_LINE);
+	glBegin(GL_LINES);
 	glVertex2f(start, start + ydisp);
 	glVertex2f(start + dx, start + dy + ydisp);
 	glEnd();
@@ -628,7 +628,7 @@
 	dy = vec[1] * k;
 
 	glColor3ub(30, 30, 220);
-	glBegin(GL_LINE);
+	glBegin(GL_LINES);
 	glVertex2f(start, start + ydisp);
 	glVertex2f(start + dx, start + dy + ydisp);
 	glEnd();