Page MenuHome
Files F26669

spelling.diff
Public
Actions

Authored By
Gavin Howard (gdh)
Nov 13 2013, 5:36 PM
Size
9 KB
Subscribers
None

spelling.diff
View Options

Index: source/blender/makesrna/intern/rna_color.c
===================================================================
--- source/blender/makesrna/intern/rna_color.c (revision 53900)
+++ source/blender/makesrna/intern/rna_color.c (working copy)
@@ -848,7 +848,7 @@
prop = RNA_def_property(srna, "show_line", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", HISTO_FLAG_LINE);
- RNA_def_property_ui_text(prop, "Show Line", "Display lines rather then filled shapes");
+ RNA_def_property_ui_text(prop, "Show Line", "Display lines rather than filled shapes");
RNA_def_property_ui_icon(prop, ICON_IPO, 0);
}
Index: source/tools/spell_check_source_config.py
===================================================================
--- source/tools/spell_check_source_config.py (revision 53900)
+++ source/tools/spell_check_source_config.py (working copy)
@@ -40,7 +40,8 @@
"enum", "enums",
"int", "ints",
"tuple", "tuples",
- # python funcs
+
+ # python functions
"repr",
"func",
@@ -69,6 +70,8 @@
"metadata",
"hashable",
"stdin",
+ "stdout",
+ "stdin",
"opengl",
"boids",
"keymap",
@@ -78,8 +81,20 @@
"booleans",
"intrinsics",
"xml",
+ "XXX",
+ "segfault",
+ "wiki",
+ "foo",
+ "diff",
+ "diffs",
+ "sudo",
+ "http",
+ "url",
+ "usr",
+ "env",
+ "app",
- # spesific computer terms/brands
+ # specific computer terms/brands
"posix",
"unix",
"amiga",
@@ -87,6 +102,8 @@
"mozilla",
"irix",
"kde",
+ "qtcreator",
+ "ack",
# general computer graphics terms
"colinear",
@@ -108,12 +125,18 @@
"normals",
# blender terms
+ "bmain",
+ "bmesh",
"bpy",
+ "bge",
"mathutils",
"fcurve",
"animviz",
"animsys",
"eekadoodle",
+ "editmode",
+ "obdata",
+ "doctree",
# should have apostrophe but ignore for now
# unless we want to get really picky!
@@ -147,6 +170,8 @@
"a-z",
"id-block",
"node-trees",
+ "pyflakes",
+ "pylint",
# acronyms
"nan",
@@ -162,6 +187,12 @@
"lhs",
"ik",
"smpte",
+ "svn",
+ "hg",
+ "rst",
+ "gl",
+ "py",
+ "xpm",
# tags
"fixme",
Index: source/tools/spell_check_source.py
===================================================================
--- source/tools/spell_check_source.py (revision 53900)
+++ source/tools/spell_check_source.py (working copy)
@@ -157,7 +157,7 @@
Extracts comments like this:
/*
- * This is a multiline comment, notice the '*'s are aligned.
+ * This is a multi-line comment, notice the '*'s are aligned.
*/
"""
i = 0
@@ -213,7 +213,7 @@
block = text[i:i_next + len(END)]
- # add whitespace infront of the block (for alignment test)
+ # add whitespace in front of the block (for alignment test)
ws = []
j = i
while j > 0 and text[j - 1] != "\n":
Index: source/tools/MakeGLStipple.py
===================================================================
--- source/tools/MakeGLStipple.py (revision 53900)
+++ source/tools/MakeGLStipple.py (working copy)
@@ -19,7 +19,7 @@
# <pep8-80 compliant>
# Converts 32x32 XPM images written be the gimp to GL stipples
-# takes xpm files as arguments, prints out C style definitions.
+# takes XPM files as arguments, prints out C style definitions.
import sys
import os
Index: source/tests/bl_mesh_validate.py
===================================================================
--- source/tests/bl_mesh_validate.py (revision 53900)
+++ source/tests/bl_mesh_validate.py (working copy)
@@ -98,7 +98,7 @@
data.loops.add(len(m[2]))
for idx, v in enumerate(m[2]):
data.loops[idx].vertex_index = v
- # Polys.
+ # Polygons.
data.polygons.add(len(m[3]))
for idx, l in enumerate(m[3]):
data.polygons[idx].loop_start = l[0]
@@ -131,7 +131,7 @@
data.loops[l].edge_index = \
random.randrange(0, len(data.edges) * 2)
elif rnd == 3:
- # Make fun with some poly.
+ # Make fun with some polygons.
p = random.randrange(0, len(data.polygons))
if random.randint(0, 1):
data.polygons[p].loop_start = \
Index: source/tests/bl_load_addons.py
===================================================================
--- source/tests/bl_load_addons.py (revision 53900)
+++ source/tests/bl_load_addons.py (working copy)
@@ -87,7 +87,7 @@
imp.reload(sys.modules[mod_name])
if do_reverse:
- # in case order matters when it shouldnt
+ # in case order matters when it shouldn't
modules.reverse()
Index: source/tests/bl_mesh_modifiers.py
===================================================================
--- source/tests/bl_mesh_modifiers.py (revision 53900)
+++ source/tests/bl_mesh_modifiers.py (working copy)
@@ -34,7 +34,7 @@
IS_BMESH = hasattr(__import__("bpy").types, "LoopColors")
# -----------------------------------------------------------------------------
-# utility funcs
+# utility functions
def render_gl(context, filepath, shade):
@@ -147,7 +147,7 @@
def ctx_camera_setup(context,
location=(0.0, 0.0, 0.0),
lookat=(0.0, 0.0, 0.0),
- # most likely the followuing vars can be left as defaults
+ # most likely the following vars can be left as defaults
up=(0.0, 0.0, 1.0),
lookat_axis='-Z',
up_axis='Y',
@@ -258,7 +258,7 @@
uv_lay = obj.data.uv_textures.new()
if IS_BMESH:
- # XXX, odd that we need to do this. until uvs and texface
+ # XXX, odd that we need to do this. until UV's and texface
# are separated we will need to keep it
uv_loops = obj.data.uv_layers[-1]
uv_list = uv_loops.data[:]
Index: source/tests/rna_info_dump.py
===================================================================
--- source/tests/rna_info_dump.py (revision 53900)
+++ source/tests/rna_info_dump.py (working copy)
@@ -18,7 +18,7 @@
# <pep8 compliant>
-# Used for generating API diff's between releases
+# Used for generating API diffs between releases
# ./blender.bin --background -noaudio --python source/tests/rna_info_dump.py
import bpy
Index: source/tests/rst_to_doctree_mini.py
===================================================================
--- source/tests/rst_to_doctree_mini.py (revision 53900)
+++ source/tests/rst_to_doctree_mini.py (working copy)
@@ -23,7 +23,7 @@
# Python classes, methods and attributes match up to those in existing modules.
# (To test for documentation completeness)
-# note: literalinclude's are not followed.
+# note: literal include's are not followed.
# could be nice to add but not really needed either right now.
import collections
Index: source/tests/bl_load_py_modules.py
===================================================================
--- source/tests/bl_load_py_modules.py (revision 53900)
+++ source/tests/bl_load_py_modules.py (working copy)
@@ -107,7 +107,7 @@
modules.append(mod_imp)
#
- # check which filepaths we didnt load
+ # check which filepaths we didn't load
source_files = []
for mod_dir in module_paths:
source_files.extend(source_list(mod_dir, filename_check=lambda f: f.endswith(".py")))
Index: source/tests/batch_import.py
===================================================================
--- source/tests/batch_import.py (revision 53900)
+++ source/tests/batch_import.py (working copy)
@@ -112,7 +112,7 @@
for i, f in enumerate(files):
print(" %s(filepath=%r) # %d of %d" % (operator, f, i + start, len(files)))
- # hack so loading the new file doesnt undo our loaded addons
+ # hack so loading the new file doesn't undo our loaded addons
addon_utils.reset_all = lambda: None # XXX, hack
bpy.ops.wm.read_factory_settings()
Index: source/tests/pep8.py
===================================================================
--- source/tests/pep8.py (revision 53900)
+++ source/tests/pep8.py (working copy)
@@ -21,20 +21,20 @@
import os
# depends on pep8, pyflakes, pylint
-# for ubuntu
+# for Ubuntu
#
# sudo apt-get install pylint pyflakes
#
# sudo apt-get install python-setuptools python-pip
# sudo pip install pep8
#
-# in debian install pylint pyflakes pep8 with apt-get/aptitude/etc
+# in Debian install pylint pyflakes pep8 with apt-get/aptitude/etc
#
# on *nix run
# python source/tests/pep8.py > test_pep8.log 2>&1
# how many lines to read into the file, pep8 comment
-# should be directly after the licence header, ~20 in most cases
+# should be directly after the license header, ~20 in most cases
PEP8_SEEK_COMMENT = 40
SKIP_PREFIX = "./tools", "./config", "./scons", "./extern"
FORCE_PEP8_ALL = False
@@ -115,7 +115,7 @@
# let pep8 complain about line length
os.system("pylint "
"--disable="
- "C0111," # missing docstring
+ "C0111," # missing doc string
"C0103," # invalid name
"W0613," # unused argument, may add this back
# but happens a lot for 'context' for eg.

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
4f/93/96cba7745c1b2dad5dffdfd41eba

Event Timeline