Cleanup: fix various typos

Differential Revision: https://developer.blender.org/D15304
This commit is contained in:
luzpaz
2022-06-28 15:35:35 +02:00
committed by Brecht Van Lommel
parent 0124de9d0e
commit 4d982cbb5d
6 changed files with 21 additions and 21 deletions
@@ -147,7 +147,7 @@ set(OPENIMAGEIO_HASH de45fb38501c4581062b522b53b6141c)
set(OPENIMAGEIO_HASH_TYPE MD5) set(OPENIMAGEIO_HASH_TYPE MD5)
set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz) 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 # the preferred version can be found in oiio's externalpackages.cmake
set(FMT_VERSION 8.0.0) set(FMT_VERSION 8.0.0)
set(FMT_URI https://github.com/fmtlib/fmt/archive/refs/tags/${FMT_VERSION}.tar.gz) 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_HASH_TYPE SHA256)
set(FMT_FILE fmt-${FMT_VERSION}.tar.gz) 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 # the preferred version can be found in oiio's externalpackages.cmake
set(ROBINMAP_VERSION v0.6.2) set(ROBINMAP_VERSION v0.6.2)
set(ROBINMAP_URI https://github.com/Tessil/robin-map/archive/refs/tags/${ROBINMAP_VERSION}.tar.gz) set(ROBINMAP_URI https://github.com/Tessil/robin-map/archive/refs/tags/${ROBINMAP_VERSION}.tar.gz)
+2 -2
View File
@@ -1,10 +1,10 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
[tool.autopep8] [tool.autopep8]
# Configuratuion for `autopep8`, allowing the command: autopep8 . # Configuration for `autopep8`, allowing the command: autopep8 .
# to reformat all source files. # 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. # which will override these settings when passed in to autopep8.
max_line_length = 120 max_line_length = 120
@@ -247,7 +247,7 @@ typedef struct SculptThreadedTaskData {
float (*mat)[4]; float (*mat)[4];
float (*vertCos)[3]; 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. */ * instead of to the current coordinates. */
bool use_proxies_orco; bool use_proxies_orco;
@@ -21,7 +21,7 @@ namespace blender::gpu {
id<MTLEvent> MTLCommandBufferManager::sync_event = nil; id<MTLEvent> MTLCommandBufferManager::sync_event = nil;
unsigned long long MTLCommandBufferManager::event_signal_val = 0; 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; int MTLCommandBufferManager::num_active_cmd_bufs = 0;
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
@@ -121,7 +121,7 @@ bool MTLCommandBufferManager::submit(bool wait)
[active_command_buffer_ waitUntilCompleted]; [active_command_buffer_ waitUntilCompleted];
/* Command buffer execution debugging can return an error message if /* 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) { if (G.debug & G_DEBUG_GPU) {
NSError *error = [active_command_buffer_ error]; NSError *error = [active_command_buffer_ error];
+1 -1
View File
@@ -124,7 +124,7 @@ void MTLContext::end_frame()
{ {
BLI_assert(is_inside_frame_); BLI_assert(is_inside_frame_);
/* Ensure pre-present work is commited. */ /* Ensure pre-present work is committed. */
this->flush(); this->flush();
/* Increment frame counter. */ /* Increment frame counter. */
+13 -13
View File
@@ -40,7 +40,7 @@ def check_loc_rot_scale(self, bone, exp_bone):
def check_parent(self, bone, exp_bone): def check_parent(self, bone, exp_bone):
self.assertEqual(type(bone.parent), type(exp_bone.parent), 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, self.assertTrue(bone.parent is None or bone.parent.name == exp_bone.parent.name,
"Bone parent does not match on bone %s" % (bone.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) exp_value = getattr(exp_bone, var)
self.assertEqual(type(value), type(exp_value), 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): if isinstance(value, str):
self.assertEqual(value, exp_value, 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"): elif hasattr(value, "name"):
self.assertEqual(value.name, exp_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: else:
self.assertAlmostEqual(value, exp_value, 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): def check_ik(self, bone, exp_bone):
@@ -81,7 +81,7 @@ def check_ik(self, bone, exp_bone):
value = getattr(bone, var) value = getattr(bone, var)
exp_value = getattr(exp_bone, var) exp_value = getattr(exp_bone, var)
self.assertAlmostEqual(value, exp_value, 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): 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) expo_const_len = len(exp_bone.constraints)
self.assertEqual(const_len, expo_const_len, 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: for exp_constraint in exp_bone.constraints:
const_name = exp_constraint.name 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) exp_value = getattr(exp_constraint, var)
self.assertEqual(type(value), type(exp_value), 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)) bone.name, const_name, var))
if isinstance(value, str): if isinstance(value, str):
self.assertEqual(value, exp_value, 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)) bone.name, const_name, var))
elif hasattr(value, "name"): 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: if value.name == input_arm.name and exp_value.name == expected_arm.name:
continue continue
self.assertEqual(value.name, exp_value.name, 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)) bone.name, const_name, var))
elif isinstance(value, bool): elif isinstance(value, bool):
self.assertEqual(value, exp_value, 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)) bone.name, const_name, var))
else: 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) bone.name, const_name, var)
self.assertAlmostEqual(value, exp_value, places=6, msg=msg) self.assertAlmostEqual(value, exp_value, places=6, msg=msg)