Revision: 48667
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48667
Author: jwilkins
Date: 2012-07-05 22:47:38 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
I mispelled gray.
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_icons.c
branches/soc-2012-swiss_cheese/source/blender/editors/mask/mask_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/area.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_nla/nla_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate_inline.h
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_gesture.c
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature_sketch.c
===================================================================
---
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature_sketch.c
2012-07-05 22:44:54 UTC (rev 48666)
+++
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature_sketch.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -548,7 +548,7 @@
}
if (i >= start && i <= end) {
- gpuCurrentGrey3f(0.300f);
+ gpuCurrentGray3f(0.300f);
}
else {
gpuCurrentColor3fv(rgb);
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
2012-07-05 22:44:54 UTC (rev 48666)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -512,7 +512,7 @@
rect.ymax = (line->to->y1 + line->to->y2) / 2.0f;
if (line->flag & UI_SELECT)
- gpuCurrentGrey3f(0.392f);
+ gpuCurrentGray3f(0.392f);
else if (highlightActiveLines && ((line->from->flag & UI_ACTIVE) ||
(line->to->flag & UI_ACTIVE)))
UI_ThemeColor(TH_TEXT_HI);
else
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_draw.c
===================================================================
---
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_draw.c
2012-07-05 22:44:54 UTC (rev 48666)
+++
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_draw.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -401,14 +401,14 @@
gpuBegin(GL_LINES);
/* below */
- gpuCurrentGrey3f(sel ? 0.784f : 0.196f);
+ gpuCurrentGray3f(sel ? 0.784f : 0.196f);
gpuAppendLinef(x1, y1, x2, y1);
/* right */
gpuAppendLinef(x2, y1, x2, y2);
/* top */
- gpuCurrentGrey3f(!sel ? 0.784f : 0.196f);
+ gpuCurrentGray3f(!sel ? 0.784f : 0.196f);
gpuAppendLinef(x1, y2, x2, y2);
/* left */
@@ -530,7 +530,7 @@
/* Start drawing the button itself */
glShadeModel(GL_SMOOTH);
- gpuCurrentGrey3f(0.784f);
+ gpuCurrentGray3f(0.784f);
gpuSingleFilledRectf((rect->xmin), (rect->ymin), (rect->xmax),
(rect->ymax));
gpuCurrentColor3x(CPACK_BLACK);
@@ -891,7 +891,7 @@
gpuImmediateFormat_V2();
/* LUMA (1 channel) */
- gpuCurrentGrey3f(alpha);
+ gpuCurrentGray3f(alpha);
if (scopes->wavefrm_mode == SCOPES_WAVEFRM_LUMA) {
glPushMatrix();
@@ -904,7 +904,7 @@
glPopMatrix();
/* min max */
- gpuCurrentGrey3f(0.500f);
+ gpuCurrentGray3f(0.500f);
min = yofs + scopes->minmax[0][0] * h;
max = yofs + scopes->minmax[0][1] * h;
CLAMP(min, rect.ymin, rect.ymax);
@@ -1115,7 +1115,7 @@
glBlendFunc(GL_ONE, GL_ONE); /* non-standard blendfunc */
/* pixel point cloud */
- gpuCurrentGrey3f(alpha);
+ gpuCurrentGray3f(alpha);
glPushMatrix();
glTranslatef(centerx, centery, 0);
@@ -1491,7 +1491,7 @@
if (but->a1 == UI_GRAD_H) {
float tsample[3];
float hsv[3];
- gpuCurrentGrey3f(0.941f);
+ gpuCurrentGray3f(0.941f);
linearrgb_to_srgb_v3_v3(tsample, cumap->sample);
rgb_to_hsv_v(tsample, hsv);
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_icons.c
===================================================================
---
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_icons.c
2012-07-05 22:44:54 UTC (rev 48666)
+++
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_icons.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -283,7 +283,7 @@
int cy = y + h / 2;
int d = MAX2(2, h / 3);
- gpuCurrentGrey4f(0.500f, alpha);
+ gpuCurrentGray4f(0.500f, alpha);
gpuBegin(GL_LINES);
@@ -335,7 +335,7 @@
viconutil_set_point(pts[1], x + 3, y + 4);
viconutil_set_point(pts[2], x + w - 3, y + 4);
- gpuCurrentGrey4f(0.500f, alpha);
+ gpuCurrentGray4f(0.500f, alpha);
viconutil_draw_tri(pts);
gpuCurrentColor4x(CPACK_BLACK, 1);
@@ -356,7 +356,7 @@
gpuCurrentColor3x(CPACK_BLACK);
viconutil_draw_lineloop_smooth(pts, 3);
- gpuCurrentGrey3f(0.900f);
+ gpuCurrentGray3f(0.900f);
viconutil_draw_points(pts, 3, 1);
}
@@ -375,11 +375,11 @@
gpuBegin(GL_TRIANGLES);
- gpuGrey4f(0.800f, alpha);
+ gpuGray4f(0.800f, alpha);
gpuVertex2iv(pts[0]);
gpuVertex2iv(pts[1]);
- gpuGrey4f(0.300f, alpha);
+ gpuGray4f(0.300f, alpha);
gpuVertex2iv(pts[2]);
gpuEnd();
@@ -401,7 +401,7 @@
viconutil_set_point(pts[1], cx - d2, cy - d);
viconutil_set_point(pts[2], cx + d2, cy);
- gpuCurrentGrey4f(0.200f, alpha);
+ gpuCurrentGray4f(0.200f, alpha);
gpuImmediateFormat_V3();
gpuBegin(GL_TRIANGLES);
@@ -427,11 +427,11 @@
gpuBegin(GL_TRIANGLES);
- gpuGrey4f(0.800f, alpha);
+ gpuGray4f(0.800f, alpha);
gpuVertex2iv(pts[0]);
gpuVertex2iv(pts[1]);
- gpuGrey4f(0.300f, alpha);
+ gpuGray4f(0.300f, alpha);
gpuVertex2iv(pts[2]);
gpuEnd();
Modified: branches/soc-2012-swiss_cheese/source/blender/editors/mask/mask_draw.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/mask/mask_draw.c
2012-07-05 22:44:54 UTC (rev 48666)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/mask/mask_draw.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -200,7 +200,7 @@
/* this could be split into its own loop */
if (draw_type == MASK_DT_OUTLINE) {
glLineWidth(3);
- gpuCurrentGrey3f(0.376f);
+ gpuCurrentGray3f(0.376f);
gpuBegin(GL_LINES);
gpuVertex3fv(vert);
gpuVertex3fv(handle);
Modified: branches/soc-2012-swiss_cheese/source/blender/editors/screen/area.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/screen/area.c
2012-07-05 22:44:54 UTC (rev 48666)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/screen/area.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -225,7 +225,7 @@
gpuCurrentColor4x(CPACK_WHITE, 0.800f);
gpuDrawDisk(0, 0, 4.25f, 16);
- gpuCurrentGrey4f(0.200f, 0.900f);
+ gpuCurrentGray4f(0.200f, 0.900f);
gpuDrawCircle(0, 0, 4.25, 16);
glDisable(GL_LINE_SMOOTH);
@@ -278,12 +278,12 @@
break;
}
- gpuCurrentGrey4f(0.050f, 0.400f);
+ gpuCurrentGray4f(0.050f, 0.400f);
uiRoundBox((float)az->x1, (float)az->y1, (float)az->x2, (float)az->y2,
4.0f);
glEnable(GL_BLEND);
- gpuCurrentGrey4f(0.800f, 0.400f);
+ gpuCurrentGray4f(0.800f, 0.400f);
draw_azone_plus((float)az->x1, (float)az->y1, (float)az->x2,
(float)az->y2);
glDisable(GL_BLEND);
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-07-05 22:44:54 UTC (rev 48666)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_edit.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -927,7 +927,7 @@
rt = 0; // CLAMPIS(G.rt, 0, 16);
if (center == 0) {
- gpuCurrentGrey3f(0.314f);
+ gpuCurrentGray3f(0.314f);
for (a = -rt; a <= rt; a++)
if (a != 0)
drawscredge_area_draw(sizex, sizey, x1, y1, x2,
y2, a);
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_dopesheet_draw.c
===================================================================
---
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_dopesheet_draw.c
2012-07-05 22:44:54 UTC (rev 48666)
+++
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_dopesheet_draw.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -134,7 +134,7 @@
if (sel)
UI_ThemeColorShadeAlpha(TH_STRIP_SELECT, 50, -255 * (1.0f -
alpha));
else
- gpuCurrentGrey4f(0.910f, alpha);
+ gpuCurrentGray4f(0.910f, alpha);
glCallList(displist2);
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_draw.c
===================================================================
---
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_draw.c
2012-07-05 22:44:54 UTC (rev 48666)
+++
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_draw.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -271,7 +271,7 @@
gpuEnd();
/* draw outline */
- gpuCurrentGrey3f(0.500f);
+ gpuCurrentGray3f(0.500f);
gpuBegin(GL_LINE_LOOP);
gpuVertex2f(dx, 3);
gpuVertex2f(dx, 17);
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/space_logic/logic_window.c
===================================================================
---
branches/soc-2012-swiss_cheese/source/blender/editors/space_logic/logic_window.c
2012-07-05 22:44:54 UTC (rev 48666)
+++
branches/soc-2012-swiss_cheese/source/blender/editors/space_logic/logic_window.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -4924,7 +4924,7 @@
if (yco-6 < ycoo) ycoo=
(yco+ycoo-20)/2;
}
else {
-
gpuCurrentGrey3f(0.600f);
+
gpuCurrentGray3f(0.600f);
gpuSingleFilledRecti(xco+22, yco, xco+width-22, yco+19);
but = uiDefBut(block,
LABEL, 0, controller_name(cont->type), (short)(xco+22), yco, 70, UI_UNIT_Y,
cont, 0, 0, 0, 0, "Controller type");
//uiButSetFunc(but,
old_sca_move_controller, cont, NULL);
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/space_nla/nla_draw.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_nla/nla_draw.c
2012-07-05 22:44:54 UTC (rev 48666)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_nla/nla_draw.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -222,7 +222,7 @@
/* drawing color is simply a light-gray */
// TODO: is this color suitable?
// XXX nasty hacked color for now... which looks quite bad too...
- gpuCurrentGrey3f(0.700f);
+ gpuCurrentGray3f(0.700f);
/* draw with AA'd line */
glEnable(GL_LINE_SMOOTH);
Modified:
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
2012-07-05 22:44:54 UTC (rev 48666)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
2012-07-05 22:47:38 UTC (rev 48667)
@@ -250,7 +250,7 @@
};
int a;
- gpuCurrentGrey3f(0.706f);
+ gpuCurrentGray3f(0.706f);
gpuBegin(GL_POLYGON);
for (a=0; a<16; a++)
@@ -804,7 +804,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
