[Bf-blender-cvs] [8618a0f4b8e] draw-deferred-compilation-experiment: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Thu Apr 21 11:14:08 CEST 2022
Commit: 8618a0f4b8e9d0c572334b31831d099cf822dbdd
Author: Campbell Barton
Date: Wed Apr 20 09:16:24 2022 +1000
Branches: draw-deferred-compilation-experiment
https://developer.blender.org/rB8618a0f4b8e9d0c572334b31831d099cf822dbdd
Cleanup: spelling in comments
===================================================================
M intern/ghost/intern/GHOST_Wintab.cpp
M source/blender/blenkernel/BKE_curves.hh
M source/blender/blenkernel/BKE_pbvh_pixels.hh
M source/blender/blenkernel/BKE_volume.h
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/object.cc
M source/blender/blenkernel/intern/pbvh_pixels.cc
M source/blender/draw/engines/eevee/eevee_shaders_extra.cc
M source/blender/draw/intern/draw_common.h
M source/blender/draw/intern/draw_shader_shared.h
M source/blender/editors/animation/keyframing.c
M source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
M source/blender/editors/object/object_add.cc
M source/blender/editors/object/object_modifier.cc
M source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
M source/blender/gpu/GPU_material.h
M source/blender/gpu/intern/gpu_shader_create_info.hh
M source/blender/io/common/intern/string_utils.cc
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/nodes/shader/node_shader_tree.cc
M source/blender/nodes/shader/nodes/node_shader_tex_environment.cc
===================================================================
diff --git a/intern/ghost/intern/GHOST_Wintab.cpp b/intern/ghost/intern/GHOST_Wintab.cpp
index 8e246272958..974a07db9c3 100644
--- a/intern/ghost/intern/GHOST_Wintab.cpp
+++ b/intern/ghost/intern/GHOST_Wintab.cpp
@@ -619,6 +619,6 @@ void GHOST_Wintab::printContextDebugInfo()
axis_y.axMax - axis_y.axMin + 1);
}
- /* Other stuff while we have a logcontext. */
+ /* Other stuff while we have a log-context. */
printf("sysmode %d\n", lc.lcSysMode);
-}
\ No newline at end of file
+}
diff --git a/source/blender/blenkernel/BKE_curves.hh b/source/blender/blenkernel/BKE_curves.hh
index 282e2a40bd0..6e4d4d560f7 100644
--- a/source/blender/blenkernel/BKE_curves.hh
+++ b/source/blender/blenkernel/BKE_curves.hh
@@ -451,7 +451,7 @@ bool last_cylic_segment_is_vector(Span<int8_t> handle_types_left, Span<int8_t> h
/**
* Return true if the handle types at the index are free (#BEZIER_HANDLE_FREE) or vector
- * (#BEZIER_HANDLE_VECTOR). In these cases, directional continuitity from the previous and next
+ * (#BEZIER_HANDLE_VECTOR). In these cases, directional continuities from the previous and next
* evaluated segments is assumed not to be desired.
*/
bool point_is_sharp(Span<int8_t> handle_types_left, Span<int8_t> handle_types_right, int index);
diff --git a/source/blender/blenkernel/BKE_pbvh_pixels.hh b/source/blender/blenkernel/BKE_pbvh_pixels.hh
index 35eb340d0a1..fdfb5fa037e 100644
--- a/source/blender/blenkernel/BKE_pbvh_pixels.hh
+++ b/source/blender/blenkernel/BKE_pbvh_pixels.hh
@@ -21,7 +21,7 @@ namespace blender::bke::pbvh::pixels {
struct TrianglePaintInput {
int3 vert_indices;
/**
- * Delta barycentric coordinates between 2 neighbouring UV's in the U direction.
+ * Delta barycentric coordinates between 2 neighboring UV's in the U direction.
*
* Only the first two coordinates are stored. The third should be recalculated
*/
diff --git a/source/blender/blenkernel/BKE_volume.h b/source/blender/blenkernel/BKE_volume.h
index 8791469360a..bc578ef8b28 100644
--- a/source/blender/blenkernel/BKE_volume.h
+++ b/source/blender/blenkernel/BKE_volume.h
@@ -78,8 +78,8 @@ const VolumeGrid *BKE_volume_grid_active_get_for_read(const struct Volume *volum
const VolumeGrid *BKE_volume_grid_find_for_read(const struct Volume *volume, const char *name);
/* Tries to set the name of the velocity field. If no such grid exists with the given base name,
- * this will try common postfixes in order to detect velocity fields split into multiple grids.
- * Return false if neither finding with the base name nor with the postfixes succeeded. */
+ * this will try common post-fixes in order to detect velocity fields split into multiple grids.
+ * Return false if neither finding with the base name nor with the post-fixes succeeded. */
bool BKE_volume_set_velocity_grid_by_name(struct Volume *volume, const char *base_name);
/* Grid
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 54fee079947..b886722676b 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1958,11 +1958,12 @@ static void nlaevalchan_assert_blendOrcombine_compatible(NlaEvalChannelSnapshot
BLI_assert(lower_necs->length == blended_necs->length);
}
-/** Check each remap domain of blended values individually in case animator had a non-combine NLA
+/**
+ * Check each remap domain of blended values individually in case animator had a non-combine NLA
* strip with a subset of quaternion channels and remapping through any of them failed and thus
* potentially has undefined values.
*
- * \returns true if case occured and handled. Returns false if case didn't occur.
+ * \returns true if case occurred and handled. Returns false if case didn't occur.
*/
static bool nlaevalchan_combine_quaternion_handle_undefined_blend_values(
NlaEvalChannelSnapshot *blended_necs, NlaEvalChannelSnapshot *upper_or_lower_necs)
@@ -1992,8 +1993,10 @@ static void nlaevalchan_copy_values(NlaEvalChannelSnapshot *dst, NlaEvalChannelS
memcpy(dst->values, src->values, src->length * sizeof(float));
}
-/** Copies from lower necs to blended necs if upper necs is NULL or has zero influence.
- * \return true if copied. */
+/**
+ * Copies from lower necs to blended necs if upper necs is NULL or has zero influence.
+ * \return true if copied.
+ */
static bool nlaevalchan_blendOrcombine_try_copy_from_lower(NlaEvalChannelSnapshot *lower_necs,
NlaEvalChannelSnapshot *upper_necs,
const float upper_influence,
@@ -2008,12 +2011,14 @@ static bool nlaevalchan_blendOrcombine_try_copy_from_lower(NlaEvalChannelSnapsho
return true;
}
-/** Copies to lower necs from blended necs if upper necs is NULL or has zero influence. If
+/**
+ * Copies to lower necs from blended necs if upper necs is NULL or has zero influence. If
* successful, copies blended_necs remap domains to lower_necs.
*
* Does not check upper value blend domains.
*
- * \return true if copied. */
+ * \return true if copied.
+ */
static bool nlaevalchan_blendOrcombine_try_copy_to_lower(NlaEvalChannelSnapshot *blended_necs,
NlaEvalChannelSnapshot *upper_necs,
const float upper_influence,
@@ -2033,7 +2038,8 @@ static bool nlaevalchan_blendOrcombine_try_copy_to_lower(NlaEvalChannelSnapshot
return true;
}
-/** Based on blendmode, blend lower necs with upper necs into blended necs.
+/**
+ * Based on blendmode, blend lower necs with upper necs into blended necs.
*
* Each upper value's blend domain determines whether to blend or to copy directly
* from lower.
@@ -2133,7 +2139,6 @@ static void nlaevalchan_combine_quaternion(NlaEvalChannelSnapshot *lower_necs,
* \param upper_blendmode: Enum value in eNlaStrip_Blend_Mode.
* \param upper_influence: Value in range [0, 1].
* \param upper_necs: Never NULL.
- *
*/
static void nlaevalchan_blendOrcombine(NlaEvalChannelSnapshot *lower_necs,
NlaEvalChannelSnapshot *upper_necs,
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index 5ff1f6b950f..cc68337e570 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -3564,19 +3564,19 @@ void BKE_object_apply_parent_inverse(struct Object *ob)
* Use parent's world transform as the child's origin.
*
* Let:
- * local = identity
- * world = orthonormalized(parent)
+ * `local = identity`
+ * `world = orthonormalized(parent)`
*
* Then:
- * world = parent @ parentinv @ local
- * inv(parent) @ world = parentinv
- * parentinv = inv(parent) @ world
+ * `world = parent @ parentinv @ local`
+ * `inv(parent) @ world = parentinv`
+ * `parentinv = inv(parent) @ world`
*
- * NOTE: If ob->obmat has shear, then this `parentinv` is insufficient because
- * parent @ parentinv => shearless result
+ * NOTE: If `ob->obmat` has shear, then this `parentinv` is insufficient because
+ * `parent @ parentinv => shearless result`
*
* Thus, local will have shear which cannot be decomposed into TRS:
- * local = inv(parent @ parentinv) @ world
+ * `local = inv(parent @ parentinv) @ world`
*
* This is currently not supported for consistency in the handling of shear during the other
* parenting ops: Parent (Keep Transform), Clear [Parent] and Keep Transform.
@@ -3591,11 +3591,11 @@ void BKE_object_apply_parent_inverse(struct Object *ob)
/* Now, preserve `world` given the new `parentinv`.
*
- * world = parent @ parentinv @ local
- * inv(parent) @ world = parentinv @ local
- * inv(parentinv) @ inv(parent) @ world = local
+ * `world = parent @ parentinv @ local`
+ * `inv(parent) @ world = parentinv @ local`
+ * `inv(parentinv) @ inv(parent) @ world = local`
*
- * local = inv(parentinv) @ inv(parent) @ world
+ * `local = inv(parentinv) @ inv(parent) @ world`
*/
float ob_local[4][4];
copy_m4_m4(ob_local, ob->parentinv);
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index d8dd2f4b382..1c1e9254157 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -22,12 +22,14 @@
namespace blender::bke::pbvh::pixels {
-/** Durind debugging this check could be enabled. It will write to each image pixel that is covered
- * by the pbvh. */
+/**
+ * During debugging this check could be enabled.
+ * It will write to each image pixel that is covered by the PBVH.
+ */
constexpr bool USE_WATERTIGHT_CHECK = false;
/**
- * Calculate the delta of two neighbour uv coordinates in the given image buffer.
+ * Calculate the delta of two neighbor UV coordinates in the given image buffer.
*/
static float2 calc_barycentric_delta(const float2 uvs[3],
const float2 start_uv,
diff --git a/source/blender/draw/engines/eevee/eevee_shaders_extra.cc b/source/blender/draw/engines/eevee/eevee_shaders_extra.cc
index 499c78723df..05577944140 100644
--- a/source/blender/draw/engines/eevee/eevee_shaders_extra.cc
+++ b/source/blender/draw/engines/eevee/eevee_shaders_extra.cc
@@ -81,7 +81,7 @@ void eevee_shader_material_create_info_amend(GPUMaterial *gpumat,
const bool do_fragment_attrib_load = is_background || is_volume;
if (is_hair && !info.vertex_out_interfaces_.is_empty()) {
- /** Hair attributes comme from sampler buffer. Transfer attributes to sampler. */
+ /** Hair attributes come from sampler buffer. Transfer attributes to sampler. */
for (auto &input : info.vertex_inputs_) {
info.sampler(0, ImageType::FLOAT_BUFFER, input.name, Frequency::BATCH);
}
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index af2efd338e4..aa421158305 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list