[Bf-blender-cvs] [7293291] master: cleanup: typos
Campbell Barton
noreply at git.blender.org
Fri Feb 27 05:58:20 CET 2015
Commit: 7293291a408aaf12e19e3a15782434ac37f4ffd1
Author: Campbell Barton
Date: Fri Feb 27 15:41:50 2015 +1100
Branches: master
https://developer.blender.org/rB7293291a408aaf12e19e3a15782434ac37f4ffd1
cleanup: typos
===================================================================
M build_files/cmake/cmake_consistency_check.py
M release/scripts/freestyle/modules/freestyle/chainingiterators.py
M release/scripts/freestyle/modules/freestyle/shaders.py
M release/scripts/freestyle/modules/freestyle/utils.py
M release/scripts/freestyle/modules/parameter_editor.py
M release/scripts/freestyle/styles/anisotropic_diffusion.py
M release/scripts/freestyle/styles/apriori_density.py
M release/scripts/freestyle/styles/cartoon.py
M release/scripts/freestyle/styles/japanese_bigbrush.py
M release/scripts/freestyle/styles/sketchy_topology_broken.py
M release/scripts/startup/bl_operators/node.py
M release/scripts/startup/bl_ui/properties_mask_common.py
M release/scripts/startup/bl_ui/properties_particle.py
===================================================================
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py
index 4b22031..0883bdb 100755
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -307,7 +307,7 @@ if UTF8_CHECK:
try:
for l in open(f, "r", encoding="utf8"):
i += 1
- except:
+ except UnicodeDecodeError:
print("Non utf8: %s:%d" % (f, i))
if i > 1:
traceback.print_exc()
diff --git a/release/scripts/freestyle/modules/freestyle/chainingiterators.py b/release/scripts/freestyle/modules/freestyle/chainingiterators.py
index 52f22b3..fc9de64 100644
--- a/release/scripts/freestyle/modules/freestyle/chainingiterators.py
+++ b/release/scripts/freestyle/modules/freestyle/chainingiterators.py
@@ -275,7 +275,7 @@ class pySketchyChainSilhouetteIterator(ChainingIterator):
class pySketchyChainingIterator(ChainingIterator):
"""
- Chaining iterator designed for sketchy style. It chaines the same
+ Chaining iterator designed for sketchy style. It chains the same
ViewEdge several times in order to produce multiple strokes per
ViewEdge.
"""
@@ -320,7 +320,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
Builds a pyFillOcclusionsRelativeChainingIterator object.
- :arg percent: The maximul length of the occluded part, expressed
+ :arg percent: The maximal length of the occluded part, expressed
in a percentage of the total chain length.
:type percent: float
"""
@@ -454,7 +454,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
Builds a pyFillOcclusionsAbsoluteAndRelativeChainingIterator object.
- :arg percent: The maximul length of the occluded part as a
+ :arg percent: The maximal length of the occluded part as a
percentage of the total chain length.
:type percent: float
:arg l: Absolute length.
@@ -524,7 +524,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
Builds a pyFillQi0AbsoluteAndRelativeChainingIterator object.
- :arg percent: The maximul length of the occluded part as a
+ :arg percent: The maximal length of the occluded part as a
percentage of the total chain length.
:type percent: float
:arg l: Absolute length.
diff --git a/release/scripts/freestyle/modules/freestyle/shaders.py b/release/scripts/freestyle/modules/freestyle/shaders.py
index 93a7b27..61365e8 100644
--- a/release/scripts/freestyle/modules/freestyle/shaders.py
+++ b/release/scripts/freestyle/modules/freestyle/shaders.py
@@ -189,7 +189,7 @@ class pyConstantThicknessShader(StrokeShader):
class pyFXSVaryingThicknessWithDensityShader(StrokeShader):
"""
- Assings thickness to a stroke based on the density of the diffuse map.
+ Assigns thickness to a stroke based on the density of the diffuse map.
"""
def __init__(self, wsize, threshold_min, threshold_max, thicknessMin, thicknessMax):
StrokeShader.__init__(self)
@@ -600,7 +600,7 @@ class pyTimeColorShader(StrokeShader):
class pySamplingShader(StrokeShader):
"""
- Resamples the stroke, which gives the stroke the ammount of
+ Resamples the stroke, which gives the stroke the amount of
vertices specified.
"""
def __init__(self, sampling):
@@ -776,7 +776,7 @@ class pyTVertexRemoverShader(StrokeShader):
class pyHLRShader(StrokeShader):
"""
- Controlls visibility based upon the quantative invisibility (QI)
+ Controls visibility based upon the quantitative invisibility (QI)
based on hidden line removal (HLR).
"""
def shade(self, stroke):
@@ -874,7 +874,7 @@ class pyBluePrintCirclesShader(StrokeShader):
R = self.__random_radius
C = self.__random_center
- # The directions (and phases) are calculated using a seperate
+ # The directions (and phases) are calculated using a separate
# function decorated with an lru-cache. This guarantees that
# the directions (involving sin and cos) are calculated as few
# times as possible.
@@ -942,7 +942,7 @@ class pyBluePrintEllipsesShader(StrokeShader):
c = prev_center + (center - prev_center) * phase
svert.point = (c.x + r.x * direction.x, c.y + r.y * direction.y)
- # remove exessive vertices
+ # remove excess vertices
if not it.is_end:
it.increment()
for sv in tuple(it):
@@ -1004,7 +1004,7 @@ class pyBluePrintSquaresShader(StrokeShader):
points = tuple(p + rand for (p, rand) in zip(points, randomization_mat))
- # substract even from uneven; result is length four tuple of vectors
+ # subtract even from uneven; result is length four tuple of vectors
it = iter(points)
old_vecs = tuple(next(it) - current for current in it)
@@ -1028,7 +1028,7 @@ class pyBluePrintSquaresShader(StrokeShader):
# special case; remove these vertices
verticesToRemove.append(svert)
- # remove exessive vertices (if any)
+ # remove excess vertices (if any)
if not it.is_end:
it.increment()
verticesToRemove += [svert for svert in it]
@@ -1066,7 +1066,7 @@ class pyBluePrintDirectedSquaresShader(StrokeShader):
sqrt_coeff = sqrt(trace * trace - 4 * det)
lambda1, lambda2 = (trace + sqrt_coeff) / 2, (trace - sqrt_coeff) / 2
- # make sure those numers aren't to small, if they are, rooting them will yield complex numbers
+ # make sure those numbers aren't to small, if they are, rooting them will yield complex numbers
lambda1, lambda2 = max(1e-12, lambda1), max(1e-12, lambda2)
theta = atan(2 * p_var_xy / (p_var.x - p_var.y)) / 2
@@ -1119,7 +1119,7 @@ class pyBluePrintDirectedSquaresShader(StrokeShader):
# special case; remove these vertices
verticesToRemove.append(svert)
- # remove exessive vertices
+ # remove excess vertices
if not it.is_end:
it.increment()
verticesToRemove += [svert for svert in it]
diff --git a/release/scripts/freestyle/modules/freestyle/utils.py b/release/scripts/freestyle/modules/freestyle/utils.py
index 6c5e1d5..224734d 100644
--- a/release/scripts/freestyle/modules/freestyle/utils.py
+++ b/release/scripts/freestyle/modules/freestyle/utils.py
@@ -221,7 +221,7 @@ def iter_material_value(stroke, func, attribute):
value = rgb_to_bw(*material.diffuse[0:3])
elif attribute == 'SPEC':
value = rgb_to_bw(*material.specular[0:3])
- # line seperate
+ # line separate
elif attribute == 'LINE_R':
value = material.line[0]
elif attribute == 'LINE_G':
@@ -230,7 +230,7 @@ def iter_material_value(stroke, func, attribute):
value = material.line[2]
elif attribute == 'LINE_A':
value = material.line[3]
- # diffuse seperate
+ # diffuse separate
elif attribute == 'DIFF_R':
value = material.diffuse[0]
elif attribute == 'DIFF_G':
@@ -239,7 +239,7 @@ def iter_material_value(stroke, func, attribute):
value = material.diffuse[2]
elif attribute == 'ALPHA':
value = material.diffuse[3]
- # specular seperate
+ # specular separate
elif attribute == 'SPEC_R':
value = material.specular[0]
elif attribute == 'SPEC_G':
@@ -262,7 +262,7 @@ def iter_distance_along_stroke(stroke):
distance += (prev - curr).length
yield distance
-# -- mathmatical operations -- #
+# -- mathematical operations -- #
def stroke_curvature(it):
diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py
index ba79c55..d476584 100644
--- a/release/scripts/freestyle/modules/parameter_editor.py
+++ b/release/scripts/freestyle/modules/parameter_editor.py
@@ -280,7 +280,7 @@ class ColorAlongStrokeShader(ColorRampModifier):
class AlphaAlongStrokeShader(CurveMappingModifier):
- """Maps a curve to the alpha/transparancy of the stroke, using the curvilinear abscissa (t)."""
+ """Maps a curve to the alpha/transparency of the stroke, using the curvilinear abscissa (t)."""
def shade(self, stroke):
for svert, t in zip(stroke, iter_t2d_along_stroke(stroke)):
a = svert.attribute.alpha
diff --git a/release/scripts/freestyle/styles/anisotropic_diffusion.py b/release/scripts/freestyle/styles/anisotropic_diffusion.py
index b17e5c2..946c111 100644
--- a/release/scripts/freestyle/styles/anisotropic_diffusion.py
+++ b/release/scripts/freestyle/styles/anisotropic_diffusion.py
@@ -19,7 +19,7 @@
# Filename : anisotropic_diffusion.py
# Author : Fredo Durand
# Date : 12/08/2004
-# Purpose : Smoothes lines using an anisotropic diffusion scheme
+# Purpose : Smooth lines using an anisotropic diffusion scheme
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
diff --git a/release/scripts/freestyle/styles/apriori_density.py b/release/scripts/freestyle/styles/apriori_density.py
index b52bcfb..1de2c4c 100644
--- a/release/scripts/freestyle/styles/apriori_density.py
+++ b/release/scripts/freestyle/styles/apriori_density.py
@@ -19,7 +19,7 @@
# Filename : apriori_density.py
# Author : Stephane Grabli
# Date : 04/08/2005
-# Purpose : Draws lines having a high a priori density
+# Purpose : Draws lines having a high a prior density
from freestyle.chainingiterators import ChainPredicateIterator
from freestyle.predicates import (
diff --git a/release/scripts/freestyle/styles/cartoon.py b/release/scripts/freestyle/styles/cartoon.py
index 2e2962c..e630127 100644
--- a/release/scripts/freestyle/styles/cartoon.py
+++ b/release/scripts/freestyle/styles/cartoon.py
@@ -20,7 +20,7 @@
# Author
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list