Revision: 14819
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14819
Author: campbellbarton
Date: 2008-05-12 23:12:10 +0200 (Mon, 12 May 2008)
Log Message:
-----------
last commit had a typo, also adjusted teh and colour instances
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/boxpack2d.c
trunk/blender/source/blender/python/api2_2x/doc/Image.py
trunk/blender/source/blender/python/api2_2x/doc/Texture.py
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/buttons_shading.c
trunk/blender/source/blender/src/drawaction.c
trunk/blender/source/blender/src/drawarmature.c
trunk/blender/source/blender/src/editaction.c
trunk/blender/source/blender/src/editview.c
trunk/blender/source/blender/src/interface_icons.c
trunk/blender/source/blender/src/usiblender.c
trunk/blender/source/blender/src/view.c
trunk/blender/source/gameengine/Ketsji/KX_Light.cpp
Modified: trunk/blender/source/blender/blenlib/intern/boxpack2d.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2008-05-12
20:59:46 UTC (rev 14818)
+++ trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2008-05-12
21:12:10 UTC (rev 14819)
@@ -130,7 +130,7 @@
* '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)
Modified: trunk/blender/source/blender/python/api2_2x/doc/Image.py
===================================================================
--- trunk/blender/source/blender/python/api2_2x/doc/Image.py 2008-05-12
20:59:46 UTC (rev 14818)
+++ trunk/blender/source/blender/python/api2_2x/doc/Image.py 2008-05-12
21:12:10 UTC (rev 14819)
@@ -48,7 +48,7 @@
@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.
"""
Modified: trunk/blender/source/blender/python/api2_2x/doc/Texture.py
===================================================================
--- trunk/blender/source/blender/python/api2_2x/doc/Texture.py 2008-05-12
20:59:46 UTC (rev 14818)
+++ trunk/blender/source/blender/python/api2_2x/doc/Texture.py 2008-05-12
21:12:10 UTC (rev 14819)
@@ -80,7 +80,7 @@
@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 @@
@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
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c
2008-05-12 20:59:46 UTC (rev 14818)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c
2008-05-12 21:12:10 UTC (rev 14819)
@@ -384,7 +384,7 @@
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(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 @@
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);
}
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2008-05-12 20:59:46 UTC
(rev 14818)
+++ trunk/blender/source/blender/src/buttons_editing.c 2008-05-12 21:12:10 UTC
(rev 14819)
@@ -5333,7 +5333,7 @@
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 @@
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;
Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c 2008-05-12 20:59:46 UTC
(rev 14818)
+++ trunk/blender/source/blender/src/buttons_shading.c 2008-05-12 21:12:10 UTC
(rev 14819)
@@ -3298,10 +3298,10 @@
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");
Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c 2008-05-12 20:59:46 UTC
(rev 14818)
+++ trunk/blender/source/blender/src/drawaction.c 2008-05-12 21:12:10 UTC
(rev 14819)
@@ -634,7 +634,7 @@
}
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 @@
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);
Modified: trunk/blender/source/blender/src/drawarmature.c
===================================================================
--- trunk/blender/source/blender/src/drawarmature.c 2008-05-12 20:59:46 UTC
(rev 14818)
+++ trunk/blender/source/blender/src/drawarmature.c 2008-05-12 21:12:10 UTC
(rev 14819)
@@ -96,7 +96,7 @@
/* 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 @@
/* 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 @@
glPushMatrix();
glMultMatrixf(pchan->pose_mat);
- /* prepare colours */
+ /* prepare colors */
if (arm->flag &
ARM_POSEMODE)
set_pchan_colorset(ob, pchan);
else {
@@ -2090,7 +2090,7 @@
for (a=0, fp=fp_start; a<len; a++, fp+=3) {
float intensity; /* how faint */
- /* set colour
+ /* set color
* - more intense for
active/selected bones, less intense for unselected bones
* - black for before current
frame, green for current frame, blue for after current frame
* - intensity decreases as
distance from current frame increases
@@ -2131,7 +2131,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
