[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48605] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48585:48604

Campbell Barton ideasman42 at gmail.com
Wed Jul 4 19:55:30 CEST 2012 

Revision: 48605
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48605
Author:   campbellbarton
Date:     2012-07-04 17:55:30 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48585:48604

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48585

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/GNUmakefile
    branches/soc-2011-tomato/doc/build_systems/scons-dev.txt
    branches/soc-2011-tomato/doc/build_systems/scons.txt
    branches/soc-2011-tomato/doc/guides/interface_API.txt
    branches/soc-2011-tomato/doc/python_api/rst/bge.render.rst
    branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
    branches/soc-2011-tomato/extern/carve/include/carve/csg.hpp
    branches/soc-2011-tomato/extern/carve/include/carve/polyline_decl.hpp
    branches/soc-2011-tomato/extern/carve/include/carve/rtree.hpp
    branches/soc-2011-tomato/extern/carve/lib/csg_data.hpp
    branches/soc-2011-tomato/extern/carve/lib/csg_detail.hpp
    branches/soc-2011-tomato/extern/carve/lib/intersect.cpp
    branches/soc-2011-tomato/extern/carve/patches/strict_flags.patch
    branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/__init__.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorToBWNode.h
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MapValueNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChangeHSVOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChromaMatteOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorMatteOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorSpillOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceMatteOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapValueOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MathBaseOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixAddOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBlendOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBurnOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixColorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDarkenOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDifferenceOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDivideOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDodgeOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixGlareOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixHueOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLightenOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLinearLightOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixMultiplyOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixOverlayOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSaturationOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixScreenOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSoftLightOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSubtractOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixValueOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersImageProg.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetAlphaOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetSamplerOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ZCombineOperation.h
    branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2011-tomato/source/blender/editors/include/ED_screen_types.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-tomato/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-tomato/source/blender/editors/space_file/file_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_file/space_file.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/dpxfile.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_key.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_world.c
    branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_api.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_apple.c
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_Tree.h
    branches/soc-2011-tomato/source/tools/uncrustify.cfg

Added Paths:
-----------
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColorProg.h

Removed Paths:
-------------
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColourProg.h

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48585
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48604

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2012-07-04 17:15:05 UTC (rev 48604)
+++ branches/soc-2011-tomato/CMakeLists.txt	2012-07-04 17:55:30 UTC (rev 48605)
@@ -1009,9 +1009,11 @@
 			set(BOOST ${LIBDIR}/boost)
 			set(BOOST_INCLUDE_DIR ${BOOST}/include)
 			if(MSVC10)
-				set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
-				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
+				set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+				set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
+				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
 			else()
+				set(BOOST_LIBPATH ${BOOST}/lib)
 				set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
 				set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")					
 			endif()
@@ -1020,11 +1022,6 @@
 				optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
 				debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
 				debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
-			if(MSVC10)
-				set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
-			else()
-				set(BOOST_LIBPATH ${BOOST}/lib)
-			endif()
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 		endif()
 			

Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile	2012-07-04 17:15:05 UTC (rev 48604)
+++ branches/soc-2011-tomato/GNUmakefile	2012-07-04 17:55:30 UTC (rev 48605)
@@ -162,21 +162,21 @@
 	@echo "  * package_pacman  - build an arch linux pacmanpackage"
 	@echo "  * package_archive - build an archive package"
 	@echo ""
-	@echo "Testing Targets (not assosiated with building blender)"
+	@echo "Testing Targets (not associated with building blender)"
 	@echo "  * test            - run ctest, currently tests import/export, operator execution and that python modules load"
 	@echo "  * test_cmake      - runs our own cmake file checker which detects errors in the cmake file list definitions"
 	@echo "  * test_pep8       - checks all python script are pep8 which are tagged to use the stricter formatting"
 	@echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
 	@echo "  * test_style      - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo ""
-	@echo "Static Source Code Checking (not assosiated with building blender)"
+	@echo "Static Source Code Checking (not associated with building blender)"
 	@echo "  * check_cppcheck    - run blender source through cppcheck (C & C++)"
 	@echo "  * check_splint      - run blenders source through splint (C only)"
 	@echo "  * check_sparse      - run blenders source through sparse (C only)"
 	@echo "  * check_spelling_c  - check for spelling errors (C/C++ only)"
 	@echo "  * check_spelling_py - check for spelling errors (Python only)"
 	@echo ""
-	@echo "Documentation Targets (not assosiated with building blender)"
+	@echo "Documentation Targets (not associated with building blender)"
 	@echo "  * doc_py   - generate sphinx python api docs"
 	@echo "  * doc_doxy - generate doxygen C/C++ docs"
 	@echo "  * doc_dna  - generate blender file format reference"

Modified: branches/soc-2011-tomato/doc/build_systems/scons-dev.txt
===================================================================
--- branches/soc-2011-tomato/doc/build_systems/scons-dev.txt	2012-07-04 17:15:05 UTC (rev 48604)
+++ branches/soc-2011-tomato/doc/build_systems/scons-dev.txt	2012-07-04 17:55:30 UTC (rev 48605)
@@ -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: branches/soc-2011-tomato/doc/build_systems/scons.txt
===================================================================
--- branches/soc-2011-tomato/doc/build_systems/scons.txt	2012-07-04 17:15:05 UTC (rev 48604)
+++ branches/soc-2011-tomato/doc/build_systems/scons.txt	2012-07-04 17:55:30 UTC (rev 48605)
@@ -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: branches/soc-2011-tomato/doc/guides/interface_API.txt
===================================================================
--- branches/soc-2011-tomato/doc/guides/interface_API.txt	2012-07-04 17:15:05 UTC (rev 48604)
+++ branches/soc-2011-tomato/doc/guides/interface_API.txt	2012-07-04 17:55:30 UTC (rev 48605)
@@ -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: branches/soc-2011-tomato/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.render.rst	2012-07-04 17:15:05 UTC (rev 48604)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.render.rst	2012-07-04 17:55:30 UTC (rev 48605)
@@ -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: branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst	2012-07-04 17:15:05 UTC (rev 48604)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst	2012-07-04 17:55:30 UTC (rev 48605)
@@ -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)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list