diff options
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 | ||||
| -rw-r--r-- | pyproject.toml | 4 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/metal/mtl_command_buffer.mm | 4 | ||||
| -rw-r--r-- | source/blender/gpu/metal/mtl_context.mm | 2 | ||||
| -rw-r--r-- | tests/python/bl_rigging_symmetrize.py | 26 |
6 files changed, 21 insertions, 21 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 550be86b6b6..c8699c3773c 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -147,7 +147,7 @@ set(OPENIMAGEIO_HASH de45fb38501c4581062b522b53b6141c) set(OPENIMAGEIO_HASH_TYPE MD5) set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz) -# 8.0.0 is currently oiio's preferred vesion although never versions may be available. +# 8.0.0 is currently oiio's preferred version although never versions may be available. # the preferred version can be found in oiio's externalpackages.cmake set(FMT_VERSION 8.0.0) set(FMT_URI https://github.com/fmtlib/fmt/archive/refs/tags/${FMT_VERSION}.tar.gz) @@ -155,7 +155,7 @@ set(FMT_HASH 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83) set(FMT_HASH_TYPE SHA256) set(FMT_FILE fmt-${FMT_VERSION}.tar.gz) -# 0.6.2 is currently oiio's preferred vesion although never versions may be available. +# 0.6.2 is currently oiio's preferred version although never versions may be available. # the preferred version can be found in oiio's externalpackages.cmake set(ROBINMAP_VERSION v0.6.2) set(ROBINMAP_URI https://github.com/Tessil/robin-map/archive/refs/tags/${ROBINMAP_VERSION}.tar.gz) diff --git a/pyproject.toml b/pyproject.toml index 22d2d768d08..cded8e51bf0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later [tool.autopep8] -# Configuratuion for `autopep8`, allowing the command: autopep8 . +# Configuration for `autopep8`, allowing the command: autopep8 . # to reformat all source files. # -# NOTE: the settings defined here map directly to commmand line arguments +# NOTE: the settings defined here map directly to command line arguments # which will override these settings when passed in to autopep8. max_line_length = 120 diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index e8a2d35ccd0..2c4f2f7370a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -247,7 +247,7 @@ typedef struct SculptThreadedTaskData { float (*mat)[4]; float (*vertCos)[3]; - /* When true, the displacement stored in the proxies will be aplied to the original coordinates + /* When true, the displacement stored in the proxies will be applied to the original coordinates * instead of to the current coordinates. */ bool use_proxies_orco; diff --git a/source/blender/gpu/metal/mtl_command_buffer.mm b/source/blender/gpu/metal/mtl_command_buffer.mm index 392e07b7ee8..375295e589e 100644 --- a/source/blender/gpu/metal/mtl_command_buffer.mm +++ b/source/blender/gpu/metal/mtl_command_buffer.mm @@ -21,7 +21,7 @@ namespace blender::gpu { id<MTLEvent> MTLCommandBufferManager::sync_event = nil; unsigned long long MTLCommandBufferManager::event_signal_val = 0; -/* Counter for active comand buffers. */ +/* Counter for active command buffers. */ int MTLCommandBufferManager::num_active_cmd_bufs = 0; /* -------------------------------------------------------------------- */ @@ -121,7 +121,7 @@ bool MTLCommandBufferManager::submit(bool wait) [active_command_buffer_ waitUntilCompleted]; /* Command buffer execution debugging can return an error message if - * execution has failed or encoutered GPU-side errors. */ + * execution has failed or encountered GPU-side errors. */ if (G.debug & G_DEBUG_GPU) { NSError *error = [active_command_buffer_ error]; diff --git a/source/blender/gpu/metal/mtl_context.mm b/source/blender/gpu/metal/mtl_context.mm index 4a76bab11b8..d4e25defecf 100644 --- a/source/blender/gpu/metal/mtl_context.mm +++ b/source/blender/gpu/metal/mtl_context.mm @@ -124,7 +124,7 @@ void MTLContext::end_frame() { BLI_assert(is_inside_frame_); - /* Ensure pre-present work is commited. */ + /* Ensure pre-present work is committed. */ this->flush(); /* Increment frame counter. */ diff --git a/tests/python/bl_rigging_symmetrize.py b/tests/python/bl_rigging_symmetrize.py index 963be6d41d3..10ba99ac6e9 100644 --- a/tests/python/bl_rigging_symmetrize.py +++ b/tests/python/bl_rigging_symmetrize.py @@ -40,7 +40,7 @@ def check_loc_rot_scale(self, bone, exp_bone): def check_parent(self, bone, exp_bone): self.assertEqual(type(bone.parent), type(exp_bone.parent), - "Missmatching types in pose.bones[%s].parent" % (bone.name)) + "Mismatching types in pose.bones[%s].parent" % (bone.name)) self.assertTrue(bone.parent is None or bone.parent.name == exp_bone.parent.name, "Bone parent does not match on bone %s" % (bone.name)) @@ -56,17 +56,17 @@ def check_bendy_bones(self, bone, exp_bone): exp_value = getattr(exp_bone, var) self.assertEqual(type(value), type(exp_value), - "Missmatching types in pose.bones[%s].%s" % (bone.name, var)) + "Mismatching types in pose.bones[%s].%s" % (bone.name, var)) if isinstance(value, str): self.assertEqual(value, exp_value, - "Missmatching value in pose.bones[%s].%s" % (bone.name, var)) + "Mismatching value in pose.bones[%s].%s" % (bone.name, var)) elif hasattr(value, "name"): self.assertEqual(value.name, exp_value.name, - "Missmatching value in pose.bones[%s].%s" % (bone.name, var)) + "Mismatching value in pose.bones[%s].%s" % (bone.name, var)) else: self.assertAlmostEqual(value, exp_value, - "Missmatching value in pose.bones[%s].%s" % (bone.name, var)) + "Mismatching value in pose.bones[%s].%s" % (bone.name, var)) def check_ik(self, bone, exp_bone): @@ -81,7 +81,7 @@ def check_ik(self, bone, exp_bone): value = getattr(bone, var) exp_value = getattr(exp_bone, var) self.assertAlmostEqual(value, exp_value, - "Missmatching value in pose.bones[%s].%s" % (bone.name, var)) + "Mismatching value in pose.bones[%s].%s" % (bone.name, var)) def check_constraints(self, input_arm, expected_arm, bone, exp_bone): @@ -89,7 +89,7 @@ def check_constraints(self, input_arm, expected_arm, bone, exp_bone): expo_const_len = len(exp_bone.constraints) self.assertEqual(const_len, expo_const_len, - "Constraints missmatch on bone %s" % (bone.name)) + "Constraints mismatch on bone %s" % (bone.name)) for exp_constraint in exp_bone.constraints: const_name = exp_constraint.name @@ -111,28 +111,28 @@ def check_constraints(self, input_arm, expected_arm, bone, exp_bone): exp_value = getattr(exp_constraint, var) self.assertEqual(type(value), type(exp_value), - "Missmatching constraint value types in pose.bones[%s].constraints[%s].%s" % ( + "Mismatching constraint value types in pose.bones[%s].constraints[%s].%s" % ( bone.name, const_name, var)) if isinstance(value, str): self.assertEqual(value, exp_value, - "Missmatching constraint value in pose.bones[%s].constraints[%s].%s" % ( + "Mismatching constraint value in pose.bones[%s].constraints[%s].%s" % ( bone.name, const_name, var)) elif hasattr(value, "name"): - # Some constraints targets the armature itself, so the armature name should missmatch. + # Some constraints targets the armature itself, so the armature name should mismatch. if value.name == input_arm.name and exp_value.name == expected_arm.name: continue self.assertEqual(value.name, exp_value.name, - "Missmatching constraint value in pose.bones[%s].constraints[%s].%s" % ( + "Mismatching constraint value in pose.bones[%s].constraints[%s].%s" % ( bone.name, const_name, var)) elif isinstance(value, bool): self.assertEqual(value, exp_value, - "Missmatching constraint boolean in pose.bones[%s].constraints[%s].%s" % ( + "Mismatching constraint boolean in pose.bones[%s].constraints[%s].%s" % ( bone.name, const_name, var)) else: - msg = "Missmatching constraint value in pose.bones[%s].constraints[%s].%s" % ( + msg = "Mismatching constraint value in pose.bones[%s].constraints[%s].%s" % ( bone.name, const_name, var) self.assertAlmostEqual(value, exp_value, places=6, msg=msg) |