[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48587] trunk/blender: Spellfixes: colour -> color
Bastien Montagne
montagne29 at wanadoo.fr
Wed Jul 4 14:19:51 CEST 2012
Revision: 48587
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48587
Author: mont29
Date: 2012-07-04 12:19:50 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Spellfixes: colour -> color
Modified Paths:
--------------
trunk/blender/doc/build_systems/scons-dev.txt
trunk/blender/doc/build_systems/scons.txt
trunk/blender/doc/guides/interface_API.txt
trunk/blender/doc/python_api/rst/bge.render.rst
trunk/blender/doc/python_api/rst/bge.types.rst
trunk/blender/source/blender/compositor/CMakeLists.txt
trunk/blender/source/blender/compositor/intern/COM_Converter.cpp
trunk/blender/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ColorToBWNode.h
trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_MapValueNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
trunk/blender/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
trunk/blender/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
trunk/blender/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChangeHSVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChannelMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ChromaMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_ColorSpillOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
trunk/blender/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_DistanceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
trunk/blender/source/blender/compositor/operations/COM_MapValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_MathBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixAddOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBlendOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixBurnOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDarkenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDifferenceOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDivideOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixDodgeOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixGlareOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixHueOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixLightenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixLinearLightOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixMultiplyOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixOverlayOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSaturationOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixScreenOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSoftLightOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixSubtractOperation.h
trunk/blender/source/blender/compositor/operations/COM_MixValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
trunk/blender/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
trunk/blender/source/blender/compositor/operations/COM_RenderLayersImageProg.h
trunk/blender/source/blender/compositor/operations/COM_SetAlphaOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetColorOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetSamplerOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetValueOperation.h
trunk/blender/source/blender/compositor/operations/COM_SetVectorOperation.h
trunk/blender/source/blender/compositor/operations/COM_ZCombineOperation.h
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/imbuf/intern/cineon/dpxfile.h
trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Added Paths:
-----------
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
Removed Paths:
-------------
trunk/blender/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
Modified: trunk/blender/doc/build_systems/scons-dev.txt
===================================================================
--- trunk/blender/doc/build_systems/scons-dev.txt 2012-07-04 11:53:48 UTC (rev 48586)
+++ trunk/blender/doc/build_systems/scons-dev.txt 2012-07-04 12:19:50 UTC (rev 48587)
@@ -37,7 +37,7 @@
Much of the actual functionality can be found in the python scripts
in the directory $BLENDERHOME/tools, with Blender.py defining the
bulk of the functionality. btools.py has some helper functions, and
- bcolors.py is for the terminal colours. mstoolkit.py and crossmingw.py
+ bcolors.py is for the terminal colors. mstoolkit.py and crossmingw.py
are modules which set up SCons for the MS VC++ 2003 toolkit and
the cross-compile toolset for compiling Windows binaries on Linux
respectively. Note: the cross-compile doesn't work yet for Blender,
Modified: trunk/blender/doc/build_systems/scons.txt
===================================================================
--- trunk/blender/doc/build_systems/scons.txt 2012-07-04 11:53:48 UTC (rev 48586)
+++ trunk/blender/doc/build_systems/scons.txt 2012-07-04 12:19:50 UTC (rev 48587)
@@ -48,7 +48,7 @@
% python ./scons/scons.py
This will start the build process with default values. Depending
- on your platform you may see colour in your output (non-Windows
+ on your platform you may see color in your output (non-Windows
machines). In the the beginning an overview of targets and arguments
from the command-line is given, then all libraries and binaries to
build are configured.
@@ -123,11 +123,11 @@
This rewrite features a cleaner output during the build process. If
you need to see the full command-line for compiles, then you can
- change that behaviour. Also the use of colours can be changed:
+ change that behaviour. Also the use of colors can be changed:
% python scons\scons.py BF_FANCY=0
- This will disable the use of colours.
+ This will disable the use of colors.
% python scons\scons.py BF_QUIET=0
Modified: trunk/blender/doc/guides/interface_API.txt
===================================================================
--- trunk/blender/doc/guides/interface_API.txt 2012-07-04 11:53:48 UTC (rev 48586)
+++ trunk/blender/doc/guides/interface_API.txt 2012-07-04 12:19:50 UTC (rev 48587)
@@ -173,7 +173,7 @@
UI_EMBOSSN 2 /* Button with no border */
UI_EMBOSSF 3 /* Square embossed button (file select) */
UI_EMBOSSM 4 /* Colored, for pulldown menus */
- UI_EMBOSSP 5 /* Simple borderless coloured button (like blender sensors) */
+ UI_EMBOSSP 5 /* Simple borderless colored button (like blender sensors) */
font:
UI_HELV 0 /* normal font */
Modified: trunk/blender/doc/python_api/rst/bge.render.rst
===================================================================
--- trunk/blender/doc/python_api/rst/bge.render.rst 2012-07-04 11:53:48 UTC (rev 48586)
+++ trunk/blender/doc/python_api/rst/bge.render.rst 2012-07-04 12:19:50 UTC (rev 48587)
@@ -94,11 +94,11 @@
If filename starts with // the image will be saved relative to the current directory.
If the filename contains # it will be replaced with the frame number.
- The standalone player saves .png files. It does not support colour space conversion
+ The standalone player saves .png files. It does not support color space conversion
or gamma correction.
When run from Blender, makeScreenshot supports Iris, IrisZ, TGA, Raw TGA, PNG, HamX, and Jpeg.
- Gamma, Colourspace conversion and Jpeg compression are taken from the Render settings panels.
+ Gamma, Colorspace conversion and Jpeg compression are taken from the Render settings panels.
:type filename: string
@@ -125,14 +125,14 @@
.. function:: setBackgroundColor(rgba)
- Sets the window background colour.
+ Sets the window background color.
:type rgba: list [r, g, b, a]
.. function:: setMistColor(rgb)
- Sets the mist colour.
+ Sets the mist color.
:type rgb: list [r, g, b]
@@ -153,8 +153,8 @@
.. function:: setMistEnd(end)
- Sets the mist end value. Objects further away from this will be coloured solid with
- the colour set by setMistColor().
+ Sets the mist end value. Objects further away from this will be colored solid with
+ the color set by setMistColor().
:type end: float
Modified: trunk/blender/doc/python_api/rst/bge.types.rst
===================================================================
--- trunk/blender/doc/python_api/rst/bge.types.rst 2012-07-04 11:53:48 UTC (rev 48586)
+++ trunk/blender/doc/python_api/rst/bge.types.rst 2012-07-04 12:19:50 UTC (rev 48587)
@@ -1683,7 +1683,7 @@
light = co.owner
light.energy = 1.0
- light.colour = [1.0, 0.0, 0.0]
+ light.color = [1.0, 0.0, 0.0]
.. data:: SPOT
@@ -1719,15 +1719,15 @@
:type: float
- .. attribute:: colour
+ .. attribute:: color
- The colour of this light. Black = [0.0, 0.0, 0.0], White = [1.0, 1.0, 1.0].
+ The color of this light. Black = [0.0, 0.0, 0.0], White = [1.0, 1.0, 1.0].
:type: list [r, g, b]
- .. attribute:: color
+ .. attribute:: colour
- Synonym for colour.
+ Synonym for color.
.. attribute:: lin_attenuation
@@ -1782,7 +1782,7 @@
#. They are at the same position
#. UV coordinates are the same
#. Their normals are the same (both polygons are "Set Smooth")
- #. They are the same colour, for example: a cube has 24 vertices: 6 faces with 4 vertices per face.
+ #. They are the same color, for example: a cube has 24 vertices: 6 faces with 4 vertices per face.
The correct method of iterating over every :class:`KX_VertexProxy` in a game object
@@ -1798,8 +1798,8 @@
for v_index in range(mesh.getVertexArrayLength(m_index)):
vertex = mesh.getVertex(m_index, v_index)
# Do something with vertex here...
- # ... eg: colour the vertex red.
- vertex.colour = [1.0, 0.0, 0.0, 1.0]
+ # ... eg: color the vertex red.
+ vertex.color = [1.0, 0.0, 0.0, 1.0]
.. attribute:: materials
@@ -2538,13 +2538,13 @@
.. attribute:: diffuse
- The diffuse colour of the material. black = [0.0, 0.0, 0.0] white = [1.0, 1.0, 1.0].
+ The diffuse color of the material. black = [0.0, 0.0, 0.0] white = [1.0, 1.0, 1.0].
:type: list [r, g, b]
.. attribute:: specular
- The specular colour of the material. black = [0.0, 0.0, 0.0] white = [1.0, 1.0, 1.0].
+ The specular color of the material. black = [0.0, 0.0, 0.0] white = [1.0, 1.0, 1.0].
:type: list [r, g, b]
@@ -3381,7 +3381,7 @@
.. class:: KX_VertexProxy(SCA_IObject)
- A vertex holds position, UV, colour and normal information.
+ A vertex holds position, UV, color and normal information.
Note:
The physics simulation is NOT currently updated - physics will not respond
@@ -3405,17 +3405,17 @@
:type: list [nx, ny, nz]
- .. attribute:: colour
+ .. attribute:: color
- The colour of the vertex.
+ The color of the vertex.
:type: list [r, g, b, a]
Black = [0.0, 0.0, 0.0, 1.0], White = [1.0, 1.0, 1.0, 1.0]
- .. attribute:: color
+ .. attribute:: colour
- Synonym for colour.
+ Synonym for color.
.. attribute:: x
@@ -3461,25 +3461,25 @@
.. attribute:: r
- The red component of the vertex colour. 0.0 <= r <= 1.0.
+ The red component of the vertex color. 0.0 <= r <= 1.0.
:type: float
.. attribute:: g
- The green component of the vertex colour. 0.0 <= g <= 1.0.
+ The green component of the vertex color. 0.0 <= g <= 1.0.
:type: float
.. attribute:: b
- The blue component of the vertex colour. 0.0 <= b <= 1.0.
+ The blue component of the vertex color. 0.0 <= b <= 1.0.
:type: float
.. attribute:: a
- The alpha component of the vertex colour. 0.0 <= a <= 1.0.
+ The alpha component of the vertex color. 0.0 <= a <= 1.0.
:type: float
@@ -3529,15 +3529,15 @@
.. method:: getRGBA()
- Gets the colour of this vertex.
+ Gets the color of this vertex.
- The colour is represented as four bytes packed into an integer value. The colour is
+ The color is represented as four bytes packed into an integer value. The color is
packed as RGBA.
Since Python offers no way to get each byte without shifting, you must use the struct module to
- access colour in an machine independent way.
+ access color in an machine independent way.
- Because of this, it is suggested you use the r, g, b and a attributes or the colour attribute instead.
+ Because of this, it is suggested you use the r, g, b and a attributes or the color attribute instead.
.. code-block:: python
@@ -3547,17 +3547,17 @@
# black = ( 0, 0, 0, 255)
# white = (255, 255, 255, 255)
- :return: packed colour. 4 byte integer with one byte per colour channel in RGBA format.
+ :return: packed color. 4 byte integer with one byte per color channel in RGBA format.
:rtype: integer
.. method:: setRGBA(col)
- Sets the colour of this vertex.
+ Sets the color of this vertex.
See getRGBA() for the format of col, and its relevant problems. Use the r, g, b and a attributes
- or the colour attribute instead.
+ or the color attribute instead.
- setRGBA() also accepts a four component list as argument col. The list represents the colour as [r, g, b, a]
+ setRGBA() also accepts a four component list as argument col. The list represents the color as [r, g, b, a]
with black = [0.0, 0.0, 0.0, 1.0] and white = [1.0, 1.0, 1.0, 1.0]
.. code-block:: python
@@ -3567,7 +3567,7 @@
v.setRGBA([1.0, 0.0, 0.0, 1.0]) # Red
v.setRGBA([0.0, 1.0, 0.0, 1.0]) # Green on all platforms.
- :arg col: the new colour of this vertex in packed RGBA format.
+ :arg col: the new color of this vertex in packed RGBA format.
:type col: integer or list [r, g, b, a]
.. method:: getNormal()
Modified: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list