diff options
Diffstat (limited to 'release')
22 files changed, 33 insertions, 33 deletions
diff --git a/release/scripts/freestyle/modules/freestyle/shaders.py b/release/scripts/freestyle/modules/freestyle/shaders.py index bce6642220b..28b8aa9b23e 100644 --- a/release/scripts/freestyle/modules/freestyle/shaders.py +++ b/release/scripts/freestyle/modules/freestyle/shaders.py @@ -881,7 +881,7 @@ class pyBluePrintCirclesShader(StrokeShader): # times as possible. # # This works because the phases and directions are only - # dependant on the stroke length, and the chance that + # dependent on the stroke length, and the chance that # stroke.resample() above produces strokes of the same length # is quite high. # diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index 5cb313ec41b..dc7f4053a01 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -352,7 +352,7 @@ def enable(module_name, *, default_set=False, persistent=False, handle_error=Non mod.__time__ = os.path.getmtime(mod.__file__) mod.__addon_enabled__ = False except Exception as ex: - # if the addon doesn't exist, dont print full traceback + # if the addon doesn't exist, don't print full traceback if type(ex) is ImportError and ex.name == module_name: print("addon not found:", repr(module_name)) else: diff --git a/release/scripts/modules/animsys_refactor.py b/release/scripts/modules/animsys_refactor.py index 39f0ad2f049..7255ce5cd22 100644 --- a/release/scripts/modules/animsys_refactor.py +++ b/release/scripts/modules/animsys_refactor.py @@ -34,7 +34,7 @@ IS_TESTING = False def drepr(string): # is there a less crappy way to do this in python?, re.escape also escapes - # single quotes strings so cant use it. + # single quotes strings so can't use it. return '"%s"' % repr(string)[1:-1].replace("\"", "\\\"").replace("\\'", "'") diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index 10a386039c4..dc4826288e3 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -248,7 +248,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): # Now here is the *ugly* hack! # Unfortunately, all classes we want to access are not available from bpy.types (OperatorProperties subclasses # are not here, as they have the same name as matching Operator ones :( ). So we use __subclasses__() calls - # to walk through all rna hierachy. + # to walk through all rna hierarchy. # But unregistered classes remain listed by relevant __subclasses__() calls (be it a Py or BPY/RNA bug), # and obviously the matching RNA struct exists no more, so trying to access their data (even the identifier) # quickly leads to segfault! @@ -498,7 +498,7 @@ def dump_py_messages_from_files(msgs, reports, files, settings): def extract_strings_split(node): """ Returns a list args as returned by 'extract_strings()', but split into groups based on separate_nodes, this way - expressions like ("A" if test else "B") wont be merged but "A" + "B" will. + expressions like ("A" if test else "B") won't be merged but "A" + "B" will. """ estr_ls = [] nds_ls = [] diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index 68a5537567c..7d5b33c50ac 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -262,7 +262,7 @@ PYGETTEXT_KEYWORDS = (() + # Check printf mismatches between msgid and msgstr. CHECK_PRINTF_FORMAT = ( - r"(?!<%)(?:%%)*%" # Begining, with handling for crazy things like '%%%%%s' + r"(?!<%)(?:%%)*%" # Beginning, with handling for crazy things like '%%%%%s' r"[-+#0]?" # Flags (note: do not add the ' ' (space) flag here, generates too much false positives!) r"(?:\*|[0-9]+)?" # Width r"(?:\.(?:\*|[0-9]+))?" # Precision diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py index 880721176e0..4be7ccf3356 100644 --- a/release/scripts/modules/bl_i18n_utils/utils.py +++ b/release/scripts/modules/bl_i18n_utils/utils.py @@ -457,7 +457,7 @@ class I18nMessages: def check(self, fix=False): """ Check consistency between messages and their keys! - Check messages using format stuff are consistant between msgid and msgstr! + Check messages using format stuff are consistent between msgid and msgstr! If fix is True, tries to fix the issues. Return a list of found errors (empty if everything went OK!). """ diff --git a/release/scripts/modules/bl_i18n_utils/utils_rtl.py b/release/scripts/modules/bl_i18n_utils/utils_rtl.py index 261d1544ac6..c446182dfc0 100755 --- a/release/scripts/modules/bl_i18n_utils/utils_rtl.py +++ b/release/scripts/modules/bl_i18n_utils/utils_rtl.py @@ -28,7 +28,7 @@ # Windows or OsX. # This uses ctypes, as there is no py3 binding for fribidi currently. # This implies you only need the compiled C library to run it. -# Finally, note that it handles some formating/escape codes (like +# Finally, note that it handles some formatting/escape codes (like # \", %s, %x12, %.4f, etc.), protecting them from ugly (evil) fribidi, # which seems completely unaware of such things (as unicode is...). @@ -79,7 +79,7 @@ MENU_DETECT_REGEX = re.compile("%x\\d+\\|") ##### Kernel processing funcs. ##### def protect_format_seq(msg): """ - Find some specific escaping/formating sequences (like \", %s, etc., + Find some specific escaping/formatting sequences (like \", %s, etc., and protect them from any modification! """ # LRM = "\u200E" diff --git a/release/scripts/modules/blend_render_info.py b/release/scripts/modules/blend_render_info.py index 3b4fb255005..8cf4734bddb 100755 --- a/release/scripts/modules/blend_render_info.py +++ b/release/scripts/modules/blend_render_info.py @@ -22,7 +22,7 @@ # This module can get render info without running from inside blender. # -# This struct wont change according to Ton. +# This struct won't change according to Ton. # Note that the size differs on 32/64bit # # typedef struct BHead { diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index 6af78bbb4c0..d236af87052 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -301,7 +301,7 @@ def resolve_ncase(path): if f_iter_nocase: return _os.path.join(dirpath, f_iter_nocase) + suffix, True else: - # cant find the right one, just return the path as is. + # can't find the right one, just return the path as is. return path, False ncase_path, found = _ncase_path_found(path) diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py index 43b02e5c881..a7872daca67 100644 --- a/release/scripts/modules/bpy_extras/mesh_utils.py +++ b/release/scripts/modules/bpy_extras/mesh_utils.py @@ -32,7 +32,7 @@ __all__ = ( def mesh_linked_uv_islands(mesh): """ - Splits the mesh into connected polygons, use this for seperating cubes from + Splits the mesh into connected polygons, use this for separating cubes from other mesh elements within 1 mesh datablock. :arg mesh: the mesh used to group with. @@ -92,7 +92,7 @@ def mesh_linked_uv_islands(mesh): def mesh_linked_tessfaces(mesh): """ - Splits the mesh into connected faces, use this for seperating cubes from + Splits the mesh into connected faces, use this for separating cubes from other mesh elements within 1 mesh datablock. :arg mesh: the mesh used to group with. @@ -182,7 +182,7 @@ def edge_loops_from_tessfaces(mesh, tessfaces=None, seams=()): Edge loops defined by faces Takes me.tessfaces or a list of faces and returns the edge loops - These edge loops are the edges that sit between quads, so they dont touch + These edge loops are the edges that sit between quads, so they don't touch 1 quad, note: not connected will make 2 edge loops, both only containing 2 edges. @@ -252,7 +252,7 @@ def edge_loops_from_tessfaces(mesh, tessfaces=None, seams=()): i = ed_adj.index(context_loop[-2]) context_loop.append(ed_adj[not i]) - # Dont look at this again + # Don't look at this again del ed_adj[:] return edge_loops @@ -377,7 +377,7 @@ def ngon_tessellate(from_data, indices, fix_loops=True): else: """ - Seperate this loop into multiple loops be finding edges that are + Separate this loop into multiple loops be finding edges that are used twice. This is used by lightwave LWO files a lot """ diff --git a/release/scripts/modules/console/complete_import.py b/release/scripts/modules/console/complete_import.py index b9b7c6cb779..ff3099d7285 100644 --- a/release/scripts/modules/console/complete_import.py +++ b/release/scripts/modules/console/complete_import.py @@ -37,7 +37,7 @@ changes have been made: - limit list of modules to prefix in case of "from w" - sorted modules - added sphinx documentation -- complete() returns a blank list of the module isnt found +- complete() returns a blank list of the module isn't found """ diff --git a/release/scripts/modules/console_python.py b/release/scripts/modules/console_python.py index 68ff1ed60a7..f264de5b140 100644 --- a/release/scripts/modules/console_python.py +++ b/release/scripts/modules/console_python.py @@ -68,7 +68,7 @@ def get_console(console_id): # check if clearing the namespace is needed to avoid a memory leak. # the window manager is normally loaded with new blend files # so this is a reasonable way to deal with namespace clearing. - # bpy.data hashing is reset by undo so cant be used. + # bpy.data hashing is reset by undo so can't be used. hash_prev = getattr(get_console, "consoles_namespace_hash", 0) if hash_prev != hash_next: diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index 1a3d0698871..53d2e2d0151 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -83,7 +83,7 @@ def float_as_string(f): def get_py_class_from_rna(rna_type): - """ Get's the Python type for a class which isn't necessarily added to ``bpy.types``. + """ Gets the Python type for a class which isn't necessarily added to ``bpy.types``. """ identifier = rna_type.identifier py_class = getattr(bpy.types, identifier, None) diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py index e8705834df3..a4610c65a43 100644 --- a/release/scripts/modules/rna_xml.py +++ b/release/scripts/modules/rna_xml.py @@ -32,7 +32,7 @@ def build_property_typemap(skip_classes, skip_typemap): if issubclass(cls, skip_classes): continue - # # to support skip-save we cant get all props + # # to support skip-save we can't get all props # properties = cls.bl_rna.properties.keys() properties = [] for prop_id, prop in cls.bl_rna.properties.items(): @@ -149,7 +149,7 @@ def rna2xml(fw=print_ln, subvalue_rna = value.path_resolve(prop, False) if type(subvalue_rna).__name__ == "bpy_prop_array": # check if this is a 0-1 color (rgb, rgba) - # in that case write as a hexidecimal + # in that case write as a hexadecimal prop_rna = value.bl_rna.properties[prop] if (prop_rna.subtype == 'COLOR_GAMMA' and prop_rna.hard_min == 0.0 and @@ -274,7 +274,7 @@ def xml2rna(root_xml, tp_name = 'STR' elif hasattr(subvalue, "__len__"): if value_xml.startswith("#"): - # read hexidecimal value as float array + # read hexadecimal value as float array value_xml_split = value_xml[1:] value_xml_coerce = [int(value_xml_split[i:i + 2], 16) / 255 for i in range(0, len(value_xml_split), 2)] diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 91e5859d2c0..a66ffb0da13 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -473,7 +473,7 @@ class ShapeTransfer(Operator): objects = [ob for ob in context.selected_editable_objects if ob != ob_act] - if 1: # swap from/to, means we cant copy to many at once. + if 1: # swap from/to, means we can't copy to many at once. if len(objects) != 1: self.report({'ERROR'}, ("Expected one other selected " diff --git a/release/scripts/startup/bl_operators/uvcalc_follow_active.py b/release/scripts/startup/bl_operators/uvcalc_follow_active.py index 72445be6950..6c307e0f440 100644 --- a/release/scripts/startup/bl_operators/uvcalc_follow_active.py +++ b/release/scripts/startup/bl_operators/uvcalc_follow_active.py @@ -52,7 +52,7 @@ def extend(obj, operator, EXTEND_MODE): # our own local walker def walk_face_init(faces, f_act): - # first tag all faces True (so we dont uvmap them) + # first tag all faces True (so we don't uvmap them) for f in bm.faces: f.tag = True # then tag faces arg False diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py index 0b0dd58e80f..d1774205aee 100644 --- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -450,7 +450,7 @@ def lightmap_uvpack(meshes, max_int_dimension = int(((side_len / float_to_int_factor)) / PREF_BOX_DIV) ok = True else: - max_int_dimension = 0.0 # wont be used + max_int_dimension = 0.0 # won't be used ok = False # RECURSIVE pretty face grouping diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index f0b1f934e38..318012d57ab 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -271,7 +271,7 @@ def optiRotateUvIsland(faces): # orient them vertically (could be an option) minx, miny, maxx, maxy = boundsIsland(faces) w, h = maxx - minx, maxy - miny - # use epsilon so we dont randomly rotate (almost) perfect squares. + # use epsilon so we don't randomly rotate (almost) perfect squares. if h + 0.00001 < w: from math import pi angle = pi / 2.0 @@ -357,7 +357,7 @@ def mergeUvIslands(islandList): BREAK = True break - # Now we have 2 islands, if the efficiency of the islands lowers theres an + # Now we have 2 islands, if the efficiency of the islands lowers there's an # increasing likely hood that we can fit merge into the bigger UV island. # this ensures a tight fit. @@ -625,7 +625,7 @@ def packIslands(islandList): h = SMALL_NUM """Save the offset to be applied later, - we could apply to the UVs now and allign them to the bottom left hand area + we could apply to the UVs now and align them to the bottom left hand area of the UV coords like the box packer imagines they are but, its quicker just to remember their offset and apply the packing and offset in 1 pass """ @@ -873,7 +873,7 @@ def main(context, # This while only gathers projection vecs, faces are assigned later on. while 1: - # If theres none there then start with the largest face + # If there's none there then start with the largest face # add all the faces that are close. for fIdx in range(len(tempMeshFaces) - 1, -1, -1): diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index edca3a521ee..7ea1eb4a89d 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -98,7 +98,7 @@ def operator_path_is_undo(context, data_path): # note that if we have data paths that use strings this could fail # luckily we don't do this! # - # When we cant find the data owner assume no undo is needed. + # When we can't find the data owner assume no undo is needed. data_path_head = data_path.rpartition(".")[0] if not data_path_head: diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index f8d9ae3ef9f..acc91edc410 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -944,7 +944,7 @@ class CLIP_PT_stabilization(CLIP_PT_reconstruction_panel, Panel): sub.menu('CLIP_MT_stabilize_2d_specials', text="", icon='DOWNARROW_HLT') - # Usually we don't hide things from iterface, but here every pixel of + # Usually we don't hide things from interface, but here every pixel of # vertical space is precious. if stab.use_stabilize_rotation: box.label(text="Tracks For Rotation / Scale") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0a365c6a20c..818c218a362 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1294,7 +1294,7 @@ class INFO_MT_add(Menu): def draw(self, context): layout = self.layout - # note, don't use 'EXEC_SCREEN' or operators wont get the 'v3d' context. + # note, don't use 'EXEC_SCREEN' or operators won't get the 'v3d' context. # Note: was EXEC_AREA, but this context does not have the 'rv3d', which prevents # "align_view" to work on first call (see [#32719]). diff --git a/release/scripts/templates_py/background_job.py b/release/scripts/templates_py/background_job.py index 2f444641a51..bd48e7bf622 100644 --- a/release/scripts/templates_py/background_job.py +++ b/release/scripts/templates_py/background_job.py @@ -95,7 +95,7 @@ def main(): help="Render an image to the specified path", ) - args = parser.parse_args(argv) # In this example we wont use the args + args = parser.parse_args(argv) # In this example we won't use the args if not argv: parser.print_help() |