[Bf-blender-cvs] [c61c7d99264] master: Cleanup: spelling (use 'gimbal' instead of 'gimble')
Campbell Barton
noreply at git.blender.org
Mon Jan 4 07:41:50 CET 2021
Commit: c61c7d99264842909bd2aed002ba4eae4fb41621
Author: Campbell Barton
Date: Mon Jan 4 11:29:11 2021 +1100
Branches: master
https://developer.blender.org/rBc61c7d99264842909bd2aed002ba4eae4fb41621
Cleanup: spelling (use 'gimbal' instead of 'gimble')
===================================================================
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/multires_reshape_ccg.c
M source/blender/blenkernel/intern/object.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/ikplugin/intern/itasc_plugin.cpp
M source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc
M source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index ced211b1926..a91183b95bd 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1926,7 +1926,7 @@ void BKE_pchan_rot_to_mat3(const bPoseChannel *pchan, float r_mat[3][3])
{
/* rotations may either be quats, eulers (with various rotation orders), or axis-angle */
if (pchan->rotmode > 0) {
- /* euler rotations (will cause gimble lock,
+ /* Euler rotations (will cause gimbal lock,
* but this can be alleviated a bit with rotation orders) */
eulO_to_mat3(r_mat, pchan->eul, pchan->rotmode);
}
diff --git a/source/blender/blenkernel/intern/multires_reshape_ccg.c b/source/blender/blenkernel/intern/multires_reshape_ccg.c
index 9159c5c03cd..804a845316f 100644
--- a/source/blender/blenkernel/intern/multires_reshape_ccg.c
+++ b/source/blender/blenkernel/intern/multires_reshape_ccg.c
@@ -77,7 +77,7 @@ bool multires_reshape_assign_final_coords_from_ccg(const MultiresReshapeContext
* not to be updated.
*
* This is a fragile logic, and is only working correctly because the code path is only
- * used by sculpt changes. In other usecases the code might not catch inconsistency and
+ * used by sculpt changes. In other use cases the code might not catch inconsistency and
* silently do wrong decision. */
/* NOTE: There is a known bug in Undo code that results in first Sculpt step
* after a Memfile one to never be undone (see T83806). This might be the root cause of
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 163e7d51235..ea0ce6a0f33 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2873,7 +2873,7 @@ void BKE_object_rot_to_mat3(const Object *ob, float mat[3][3], bool use_drot)
/* rotations may either be quats, eulers (with various rotation orders), or axis-angle */
if (ob->rotmode > 0) {
/* Euler rotations
- * (will cause gimble lock, but this can be alleviated a bit with rotation orders). */
+ * (will cause gimbal lock, but this can be alleviated a bit with rotation orders). */
eulO_to_mat3(rmat, ob->rot, ob->rotmode);
eulO_to_mat3(dmat, ob->drot, ob->rotmode);
}
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 2c64388e66d..80771df3572 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -1776,7 +1776,7 @@ void FONT_OT_text_insert(wmOperatorType *ot)
/** \} */
/* -------------------------------------------------------------------- */
-/** \name Textbox Add Operator
+/** \name Text-Box Add Operator
* \{ */
static int textbox_add_exec(bContext *C, wmOperator *UNUSED(op))
@@ -1817,7 +1817,7 @@ void FONT_OT_textbox_add(wmOperatorType *ot)
/** \} */
/* -------------------------------------------------------------------- */
-/** \name Textbox Remove Operator
+/** \name Text-Box Remove Operator
* \{ */
static int textbox_remove_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index afe0159eb26..6cf8515bdbb 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1148,7 +1148,7 @@ static ImBuf *icon_preview_imbuf_from_brush(Brush *brush)
BKE_main_blendfile_path_from_global(), path, folder, brush->icon_filepath);
if (path[0]) {
- /* use fefault color spaces */
+ /* Use default color spaces. */
brush->icon_imbuf = IMB_loadiffname(path, flags, NULL);
}
}
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index f8905d772b2..acfeccca175 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -655,9 +655,9 @@ static void outliner_add_library_override_contents(SpaceOutliner *soops, TreeEle
int index = 0;
LISTBASE_FOREACH (IDOverrideLibraryProperty *, op, &id->override_library->properties) {
if (!BKE_lib_override_rna_property_find(&idpoin, op, &override_ptr, &override_prop)) {
- /* This is fine, override properties list is not alwasy fully up-to-date with current
- * RNA/IDProps etc., this gets cleaned up when re-generating the overrides rules, no error
- * here. */
+ /* This is fine, override properties list is not always fully up-to-date with current
+ * RNA/IDProps etc., this gets cleaned up when re-generating the overrides rules,
+ * no error here. */
continue;
}
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 4e9ddb54c5e..56f0c0afccf 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -827,14 +827,14 @@ static void viewrotate_apply(ViewOpsData *vod, const int event_xy[2])
quat_to_mat3(m, vod->curr.viewquat);
invert_m3_m3(m_inv, m);
- /* Avoid Gimble Lock
+ /* Avoid Gimbal Lock
*
* Even though turn-table mode is in use, this can occur when the user exits the camera view
* or when aligning the view to a rotated object.
*
- * We have gimble lock when the user's view is rotated +/- 90 degrees along the view axis.
+ * We have gimbal lock when the user's view is rotated +/- 90 degrees along the view axis.
* In this case the vertical rotation is the same as the sideways turntable motion.
- * Making it impossible to get out of the gimble locked state without resetting the view.
+ * Making it impossible to get out of the gimbal locked state without resetting the view.
*
* The logic below lets the user exit out of this state without any abrupt 'fix'
* which would be disorienting.
@@ -843,7 +843,7 @@ static void viewrotate_apply(ViewOpsData *vod, const int event_xy[2])
* - Rotated-horizon: `cross_v3_v3v3(xaxis, zvec_global, m_inv[2])`
* When only this is used, this turntable rotation works - but it's side-ways
* (as if the entire turn-table has been placed on its side)
- * While there is no gimble lock, it's also awkward to use.
+ * While there is no gimbal lock, it's also awkward to use.
* - Un-rotated-horizon: `m_inv[0]`
* When only this is used, the turntable rotation can have gimbal lock.
*
@@ -852,7 +852,7 @@ static void viewrotate_apply(ViewOpsData *vod, const int event_xy[2])
* Blending isn't essential, it just makes the transition smoother.
*
* This allows sideways turn-table rotation on a Z axis that isn't world-space Z,
- * While up-down turntable rotation eventually corrects gimble lock. */
+ * While up-down turntable rotation eventually corrects gimbal lock. */
#if 1
if (len_squared_v3v3(zvec_global, m_inv[2]) > 0.001f) {
float fac;
diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp
index 9512bce1914..3f444172499 100644
--- a/source/blender/ikplugin/intern/itasc_plugin.cpp
+++ b/source/blender/ikplugin/intern/itasc_plugin.cpp
@@ -868,7 +868,7 @@ static bool joint_callback(const iTaSC::Timestamp ×tamp,
float rmat[3][3];
if (chan->rotmode > 0) {
- /* euler rotations (will cause gimble lock, but this can be alleviated a bit with rotation
+ /* Euler rotations (will cause gimbal lock, but this can be alleviated a bit with rotation
* orders) */
eulO_to_mat3(rmat, chan->eul, chan->rotmode);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc
index 3f7023ba88f..66a0b0b8d3e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_color_ramp.cc
@@ -39,7 +39,7 @@ static void execute_on_component(const GeoNodeExecParams ¶ms, GeometryCompon
const std::string result_name = params.get_input<std::string>("Result");
/* Once we support more domains at the user level, we have to decide how the result domain is
- * choosen. */
+ * chosen. */
const AttributeDomain result_domain = ATTR_DOMAIN_POINT;
const CustomDataType result_type = CD_PROP_COLOR;
diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc b/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc
index e53157cb5f8..3f70ef829e6 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc
@@ -95,7 +95,7 @@ static float point_weight_influence_get(const float maximum_distance,
* Weight each point based on their proximity to its neighbors
*
* For each index in the weight array add a weight based on the proximity the
- * corresponding point has with its neighboors.
+ * corresponding point has with its neighbors.
**/
static void points_distance_weight_calculate(Vector<float> *weights,
const size_t point_id,
More information about the Bf-blender-cvs
mailing list