From ac71783e8dccdb42afb8e68ae077902185bb42c0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 May 2008 21:12:10 +0000 Subject: last commit had a typo, also adjusted teh and colour instances --- source/blender/blenlib/intern/boxpack2d.c | 2 +- source/blender/python/api2_2x/doc/Image.py | 2 +- source/blender/python/api2_2x/doc/Texture.py | 8 ++++---- source/blender/render/intern/source/rayshade.c | 8 ++++---- source/blender/src/buttons_editing.c | 4 ++-- source/blender/src/buttons_shading.c | 6 +++--- source/blender/src/drawaction.c | 4 ++-- source/blender/src/drawarmature.c | 10 +++++----- source/blender/src/editaction.c | 4 ++-- source/blender/src/editview.c | 2 +- source/blender/src/interface_icons.c | 2 +- source/blender/src/usiblender.c | 4 ++-- source/blender/src/view.c | 2 +- source/gameengine/Ketsji/KX_Light.cpp | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) (limited to 'source') diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c index 21810613c7f..acd53e5d516 100644 --- a/source/blender/blenlib/intern/boxpack2d.c +++ b/source/blender/blenlib/intern/boxpack2d.c @@ -130,7 +130,7 @@ static int vertex_sort(const void *p1, const void *p2) * 'box->index' is not used at all, the only reason its there * is that the box array is sorted by area and programs need to be able * to have some way of writing the boxes back to the original data. - * len - the number of boxes in teh array. + * len - the number of boxes in the array. * tot_width and tot_height are set so you can normalize the data. * */ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height) diff --git a/source/blender/python/api2_2x/doc/Image.py b/source/blender/python/api2_2x/doc/Image.py index 92a05c2604d..564cac3ef9b 100644 --- a/source/blender/python/api2_2x/doc/Image.py +++ b/source/blender/python/api2_2x/doc/Image.py @@ -48,7 +48,7 @@ def New (name, width, height, depth): @type height: int @param height: The height of the new Image object, between 1 and 5000. @type depth: int - @param depth: The colour depth of the new Image object. (32:RGBA 8bit channels, 128:RGBA 32bit high dynamic range float channels). + @param depth: The color depth of the new Image object. (32:RGBA 8bit channels, 128:RGBA 32bit high dynamic range float channels). @rtype: Blender Image @return: A new Blender Image object. """ diff --git a/source/blender/python/api2_2x/doc/Texture.py b/source/blender/python/api2_2x/doc/Texture.py index 5161ac5ea56..7f42d06240b 100644 --- a/source/blender/python/api2_2x/doc/Texture.py +++ b/source/blender/python/api2_2x/doc/Texture.py @@ -80,7 +80,7 @@ Example:: @type ExtendModes: readonly dictionary @var ExtendModes: Extend, clip, repeat or checker modes for image textures - - EXTEND - Extends the colour of the edge + - EXTEND - Extends the color of the edge - CLIP - Return alpha 0.0 outside image - CLIPCUBE - Return alpha 0.0 around cube-shaped area around image - REPEAT - Repeat image vertically and horizontally @@ -209,10 +209,10 @@ Example:: @type TexCo: readonly dictionary @var MapTo: Flags for MTex.mapto. - - COL - Make the texture affect the basic colour of the material + - COL - Make the texture affect the basic color of the material - NOR - Make the texture affect the rendered normal - - CSP - Make the texture affect the specularity colour - - CMIR - Make the texture affect the mirror colour + - CSP - Make the texture affect the specularity color + - CMIR - Make the texture affect the mirror color - REF - Make the texture affect the diffuse reflectivity value - SPEC - Make the texture affect the specularity value - HARD - Make the texture affect the hardness value diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 6aee1d2a883..8fd07001bd1 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -384,7 +384,7 @@ static float shade_by_transmission(Isect *is, ShadeInput *shi, ShadeResult *shr) static void ray_fadeout_endcolor(float *col, ShadeInput *origshi, ShadeInput *shi, ShadeResult *shr, Isect *isec, float *vec) { - /* un-intersected rays get either rendered material colour or sky colour */ + /* un-intersected rays get either rendered material color or sky color */ if (origshi->mat->fadeto_mir == MA_RAYMIR_FADETOMAT) { VECCOPY(col, shr->combined); } else if (origshi->mat->fadeto_mir == MA_RAYMIR_FADETOSKY) { @@ -397,7 +397,7 @@ static void ray_fadeout_endcolor(float *col, ShadeInput *origshi, ShadeInput *sh static void ray_fadeout(Isect *is, ShadeInput *shi, float *col, float *blendcol, float dist_mir) { - /* if fading out, linear blend against fade colour */ + /* if fading out, linear blend against fade color */ float blendfac; blendfac = 1.0 - VecLenf(shi->co, is->start)/dist_mir; @@ -544,8 +544,8 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, flo if (dist_mir > 0.0) { float blendcol[3]; - /* max ray distance set, but found an intersection, so fade this colour - * out towards the sky/material colour for a smooth transition */ + /* max ray distance set, but found an intersection, so fade this color + * out towards the sky/material color for a smooth transition */ ray_fadeout_endcolor(blendcol, origshi, &shi, origshr, &isec, vec); ray_fadeout(&isec, &shi, col, blendcol, dist_mir); } diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 376d89389ee..2ffec207e84 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -5333,7 +5333,7 @@ static void editing_panel_links(Object *ob) uiDefBut(block, BUT, B_POSEGRP_ADD, "Add Group", xco,110,140,20, 0, 21, 0, 0, 0, "Add a new Bone Group for the Pose"); uiBlockEndAlign(block); - /* colour set for 'active' group */ + /* color set for 'active' group */ if (pose->active_group && grp) { uiBlockBeginAlign(block); menustr= build_colorsets_menustr(); @@ -5350,7 +5350,7 @@ static void editing_panel_links(Object *ob) memcpy(&grp->cs, col_set, sizeof(ThemeWireColor)); } else { - /* init custom colours with a generic multi-colour rgb set, if not initialised already */ + /* init custom colors with a generic multi-color rgb set, if not initialised already */ if (grp->cs.solid[0] == 0) { /* define for setting colors in theme below */ #define SETCOL(col, r, g, b, a) col[0]=r; col[1]=g; col[2]= b; col[3]= a; diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 69b1121da84..a4ddd55d2f0 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -3298,10 +3298,10 @@ static void material_panel_map_to(Object *ob, Material *ma, int from_nodes) uiBlockSetCol(block, TH_AUTO); } else { - uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Col", 10,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic colour of the material"); + uiDefButBitS(block, TOG, MAP_COL, B_MATPRV, "Col", 10,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect basic color of the material"); uiDefButBitS(block, TOG3, MAP_NORM, B_MATPRV, "Nor", 50,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the rendered normal"); - uiDefButBitS(block, TOG, MAP_COLSPEC, B_MATPRV, "Csp", 90,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the specularity colour"); - uiDefButBitS(block, TOG, MAP_COLMIR, B_MATPRV, "Cmir", 130,180,50,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the mirror colour"); + uiDefButBitS(block, TOG, MAP_COLSPEC, B_MATPRV, "Csp", 90,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the specularity color"); + uiDefButBitS(block, TOG, MAP_COLMIR, B_MATPRV, "Cmir", 130,180,50,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the mirror color"); uiDefButBitS(block, TOG3, MAP_REF, B_MATPRV, "Ref", 180,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the value of the materials reflectivity"); uiDefButBitS(block, TOG3, MAP_SPEC, B_MATPRV, "Spec", 220,180,50,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the value of specularity"); uiDefButBitS(block, TOG3, MAP_AMB, B_MATPRV, "Amb", 270,180,40,19, &(mtex->mapto), 0, 0, 0, 0, "Causes the texture to affect the value of ambient"); diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index 1a742440e9b..65221dceaf9 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -634,7 +634,7 @@ static void draw_channel_names(void) } else { /* for normal channels - * - use 3 shades of color group/standard colour for 3 indention level + * - use 3 shades of color group/standard color for 3 indention level * - only use group colors if allowed to, and if actually feasible */ if ( !(G.saction->flag & SACTION_NODRAWGCOLORS) && @@ -1254,7 +1254,7 @@ static void draw_key_but(int x, int y, short w, short h, int sel) int xmax= x+w-1, ymax= y+h-1; int xc= (xmin+xmax)/2, yc= (ymin+ymax)/2; - /* interior - hardcoded colours (for selected and unselected only) */ + /* interior - hardcoded colors (for selected and unselected only) */ if (sel) glColor3ub(0xF1, 0xCA, 0x13); else glColor3ub(0xE9, 0xE9, 0xE9); diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c index 9b8905b782b..99de2c1583d 100644 --- a/source/blender/src/drawarmature.c +++ b/source/blender/src/drawarmature.c @@ -96,7 +96,7 @@ static ThemeWireColor *bcolor= NULL; /* values of colCode for set_pchan_glcolor */ enum { PCHAN_COLOR_NORMAL = 0, /* normal drawing */ - PCHAN_COLOR_SOLID, /* specific case where "solid" colour is needed */ + PCHAN_COLOR_SOLID, /* specific case where "solid" color is needed */ PCHAN_COLOR_CONSTS, /* "constraint" colors (which may/may-not be suppressed) */ PCHAN_COLOR_SPHEREBONE_BASE, /* for the 'stick' of sphere (envelope) bones */ @@ -1186,7 +1186,7 @@ static void draw_b_bone(int dt, int armflag, int boneflag, int constflag, unsign /* wire */ if (armflag & ARM_POSEMODE) { if (constflag) { - /* set constraint colours */ + /* set constraint colors */ if (set_pchan_glColor(PCHAN_COLOR_CONSTS, armflag, boneflag, constflag)) { glEnable(GL_BLEND); @@ -1645,7 +1645,7 @@ static void draw_pose_channels(Base *base, int dt) glPushMatrix(); glMultMatrixf(pchan->pose_mat); - /* prepare colours */ + /* prepare colors */ if (arm->flag & ARM_POSEMODE) set_pchan_colorset(ob, pchan); else { @@ -2090,7 +2090,7 @@ static void draw_pose_paths(Object *ob) for (a=0, fp=fp_start; acs, col_set, sizeof(ThemeWireColor)); } else { - /* init custom colours with a generic multi-colour rgb set, if not initialised already */ + /* init custom colors with a generic multi-color rgb set, if not initialised already */ if (agrp->cs.solid[0] == 0) { /* define for setting colors in theme below */ #define SETCOL(col, r, g, b, a) col[0]=r; col[1]=g; col[2]= b; col[3]= a; @@ -1221,7 +1221,7 @@ void sync_pchan2achan_grouping () achan->grp = NULL; BLI_freelistN(&act->groups); - /* loop through all achans, reassigning them to groups (colours are resyncronised) */ + /* loop through all achans, reassigning them to groups (colors are resyncronised) */ last= act->chanbase.last; for (achan= act->chanbase.first; achan && achan!=last; achan= next) { next= achan->next; diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index b7fbddc520f..e3ec69975de 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -2764,7 +2764,7 @@ void fly(void) do_screenhandlers(G.curscreen); /* advance the next frame */ - /* we are in camera view so apply the view ofs and quat to the view matrix and set the camera to teh view */ + /* we are in camera view so apply the view ofs and quat to the view matrix and set the camera to the view */ if (G.vd->persp==V3D_CAMOB) { G.vd->persp= V3D_PERSP; /*set this so setviewmatrixview3d uses the ofs and quat instead of the camera */ setviewmatrixview3d(); diff --git a/source/blender/src/interface_icons.c b/source/blender/src/interface_icons.c index ae9dc2b0dc5..bd06e461745 100644 --- a/source/blender/src/interface_icons.c +++ b/source/blender/src/interface_icons.c @@ -939,7 +939,7 @@ static void icon_draw_rect(float x, float y, int w, int h, float aspect, int rw, ui_rasterpos_safe(x, y, aspect); if((w<1 || h<1) && G.f & G_DEBUG) { - printf("what the heck! - icons are %i x %i zero pixels?\n", w, h); + printf("what the heck! - icons are %i x %i pixels?\n", w, h); } /* rect contains image in 'rendersize', we only scale if needed */ else if(rw!=w && rh!=h) { diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 8d6bf830dbf..6c0838288b8 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -389,7 +389,7 @@ static void init_userdef_file(void) if ((G.main->versionfile < 245) || (G.main->versionfile == 245 && G.main->subversionfile < 11)) { bTheme *btheme; for (btheme= U.themes.first; btheme; btheme= btheme->next) { - /* these should all use the same colour */ + /* these should all use the same color */ SETCOL(btheme->tv3d.cframe, 0x60, 0xc0, 0x40, 255); SETCOL(btheme->tipo.cframe, 0x60, 0xc0, 0x40, 255); SETCOL(btheme->tact.cframe, 0x60, 0xc0, 0x40, 255); @@ -402,7 +402,7 @@ static void init_userdef_file(void) if ((G.main->versionfile < 245) || (G.main->versionfile == 245 && G.main->subversionfile < 13)) { bTheme *btheme; for (btheme= U.themes.first; btheme; btheme= btheme->next) { - /* action channel groups (recolour anyway) */ + /* action channel groups (recolor anyway) */ SETCOL(btheme->tact.group, 0x39, 0x7d, 0x1b, 255); SETCOL(btheme->tact.group_active, 0x7d, 0xe9, 0x60, 255); diff --git a/source/blender/src/view.c b/source/blender/src/view.c index 163a116371d..3dae0118bf4 100644 --- a/source/blender/src/view.c +++ b/source/blender/src/view.c @@ -2111,7 +2111,7 @@ void smooth_view(View3D *v3d, float *ofs, float *quat, float *dist, float *lens) changed = 1; } - /* The new view is different from teh old one + /* The new view is different from the old one * so animate the view */ if (changed) { diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp index 3ae09c01270..7decc5bc769 100644 --- a/source/gameengine/Ketsji/KX_Light.cpp +++ b/source/gameengine/Ketsji/KX_Light.cpp @@ -223,7 +223,7 @@ char KX_LightObject::doc[] = "Module KX_LightObject\n\n" "\t\tThe effect radius of the light.\n" "\tcolour -> list [r, g, b].\n" "\tcolor -> list [r, g, b].\n" -"\t\tThe colour of the light.\n" +"\t\tThe color of the light.\n" "\tlin_attenuation -> float.\n" "\t\tThe attenuation factor for the light.\n" "\tspotsize -> float.\n" -- cgit v1.2.3