[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3575] trunk/py/scripts/addons: Spellfixes: colour -> color

Bastien Montagne montagne29 at wanadoo.fr
Wed Jul 4 14:20:09 CEST 2012


Revision: 3575
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3575
Author:   mont29
Date:     2012-07-04 12:20:09 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Spellfixes: colour -> color

Modified Paths:
--------------
    trunk/py/scripts/addons/io_mesh_ply/export_ply.py
    trunk/py/scripts/addons/io_scene_obj/export_obj.py
    trunk/py/scripts/addons/render_povray/render.py

Modified: trunk/py/scripts/addons/io_mesh_ply/export_ply.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_ply/export_ply.py	2012-07-04 08:48:33 UTC (rev 3574)
+++ trunk/py/scripts/addons/io_mesh_ply/export_ply.py	2012-07-04 12:20:09 UTC (rev 3575)
@@ -20,7 +20,7 @@
 
 """
 This script exports Stanford PLY files from Blender. It supports normals,
-colours, and texture coordinates per face or per vertex.
+colors, and texture coordinates per face or per vertex.
 Only one mesh can be exported at a time.
 """
 

Modified: trunk/py/scripts/addons/io_scene_obj/export_obj.py
===================================================================
--- trunk/py/scripts/addons/io_scene_obj/export_obj.py	2012-07-04 08:48:33 UTC (rev 3574)
+++ trunk/py/scripts/addons/io_scene_obj/export_obj.py	2012-07-04 12:20:09 UTC (rev 3575)
@@ -72,7 +72,7 @@
             fw('Ns %.6f\n' % tspec)
             del tspec
 
-            fw('Ka %.6f %.6f %.6f\n' % (mat.ambient * world_amb)[:])  # Ambient, uses mirror colour,
+            fw('Ka %.6f %.6f %.6f\n' % (mat.ambient * world_amb)[:])  # Ambient, uses mirror color,
             fw('Kd %.6f %.6f %.6f\n' % (mat.diffuse_intensity * mat.diffuse_color)[:])  # Diffuse
             fw('Ks %.6f %.6f %.6f\n' % (mat.specular_intensity * mat.specular_color)[:])  # Specular
             if hasattr(mat, "ior"):
@@ -92,7 +92,7 @@
         else:
             #write a dummy material here?
             fw('Ns 0\n')
-            fw('Ka %.6f %.6f %.6f\n' % world_amb[:])  # Ambient, uses mirror colour,
+            fw('Ka %.6f %.6f %.6f\n' % world_amb[:])  # Ambient, uses mirror color,
             fw('Kd 0.8 0.8 0.8\n')
             fw('Ks 0.8 0.8 0.8\n')
             fw('d 1\n')  # No alpha

Modified: trunk/py/scripts/addons/render_povray/render.py
===================================================================
--- trunk/py/scripts/addons/render_povray/render.py	2012-07-04 08:48:33 UTC (rev 3574)
+++ trunk/py/scripts/addons/render_povray/render.py	2012-07-04 12:20:09 UTC (rev 3575)
@@ -567,7 +567,7 @@
 
             matrix = global_matrix * ob.matrix_world
 
-            # Colour is modified by energy #muiltiplie by 2 for a better match --Maurice
+            # Color is modified by energy #muiltiplie by 2 for a better match --Maurice
             color = tuple([c * lamp.energy * 2.0 for c in lamp.color])
 
             tabWrite("light_source {\n")
@@ -934,8 +934,8 @@
             file.write("\n")
             tabWrite("}\n")
 
-            # Vertex colours
-            vertCols = {}  # Use for material colours also.
+            # Vertex colors
+            vertCols = {}  # Use for material colors also.
 
             if uv_layer:
                 # Generate unique UV's
@@ -1012,7 +1012,7 @@
                                 vertCols[key] = [-1]
 
             else:
-                # No vertex colours, so write material colours as vertex colours
+                # No vertex colors, so write material colors as vertex colors
                 for i, material in enumerate(me_materials):
 
                     if material:
@@ -1026,7 +1026,7 @@
                             key = diffuse_color[0], diffuse_color[1], diffuse_color[2], i  # i == f.mat
                             vertCols[key] = [-1]
 
-            # Vert Colours
+            # Vert Colors
             tabWrite("texture_list {\n")
             file.write(tabStr + "%s" % (len(vertCols)))  # vert count
             idx = 0
@@ -1426,7 +1426,7 @@
                     material = me_materials[material_index]
                     for i1, i2, i3 in indices:
                         if me.vertex_colors and material.use_vertex_color_paint:
-                            # Colour per vertex - vertex colour
+                            # Color per vertex - vertex color
 
                             col1 = cols[i1]
                             col2 = cols[i2]
@@ -1436,7 +1436,7 @@
                             ci2 = vertCols[col2[0], col2[1], col2[2], material_index][0]
                             ci3 = vertCols[col3[0], col3[1], col3[2], material_index][0]
                         else:
-                            # Colour per material - flat material colour
+                            # Color per material - flat material color
                             if material.subsurface_scattering.use:
                                 diffuse_color = [i * j for i, j in zip(material.subsurface_scattering.color[:], material.diffuse_color[:])]
                             else:



More information about the Bf-extensions-cvs mailing list