[Bf-blender-cvs] [6797de4e106] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Sat Dec 17 03:16:00 CET 2022
Commit: 6797de4e10622a9c30b5e5c72c94e520b6b6c656
Author: Campbell Barton
Date: Sat Dec 17 13:14:01 2022 +1100
Branches: master
https://developer.blender.org/rB6797de4e10622a9c30b5e5c72c94e520b6b6c656
Cleanup: spelling in comments
===================================================================
M intern/cycles/hydra/field.cpp
M intern/cycles/kernel/integrator/init_from_bake.h
M intern/ghost/intern/GHOST_SystemWin32.cpp
M source/blender/blenkernel/intern/key.cc
M source/blender/draw/engines/basic/shaders/infos/basic_depth_info.hh
M source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
M source/blender/editors/asset/intern/asset_indexer.cc
M source/blender/editors/include/ED_mesh.h
===================================================================
diff --git a/intern/cycles/hydra/field.cpp b/intern/cycles/hydra/field.cpp
index 7cdb4c80d79..e72d86c216c 100644
--- a/intern/cycles/hydra/field.cpp
+++ b/intern/cycles/hydra/field.cpp
@@ -26,8 +26,7 @@ class HdCyclesVolumeLoader : public VDBImageLoader {
HdCyclesVolumeLoader(const std::string &filePath, const std::string &gridName)
: VDBImageLoader(gridName)
{
- /* Disably delay loading and file copying, this has poor performance
- * on network drivers. */
+ /* Disable delay loading and file copying, this has poor performance on network drivers. */
const bool delay_load = false;
openvdb::io::File file(filePath);
file.setCopyMaxBytes(0);
diff --git a/intern/cycles/kernel/integrator/init_from_bake.h b/intern/cycles/kernel/integrator/init_from_bake.h
index 2a5bda50fb3..308f708380f 100644
--- a/intern/cycles/kernel/integrator/init_from_bake.h
+++ b/intern/cycles/kernel/integrator/init_from_bake.h
@@ -18,7 +18,7 @@ CCL_NAMESPACE_BEGIN
/* In order to perform anti-aliasing during baking, we jitter the input barycentric coordinates
* (which are for the center of the texel) within the texel.
- * However, the baking code corrently doesn't support going to neighboring triangle, so if the
+ * However, the baking code currently doesn't support going to neighboring triangle, so if the
* jittered location falls outside of the input triangle, we need to bring it back in somehow.
* Clamping is a bad choice here since it can produce noticeable artifacts at triangle edges,
* but properly uniformly sampling the intersection of triangle and texel would be very
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 8cb007a756a..d1e0d138918 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1063,7 +1063,7 @@ GHOST_EventCursor *GHOST_SystemWin32::processCursorEvent(GHOST_WindowWin32 *wind
if (window->getCursorGrabModeIsWarp()) {
static uint64_t last_warp_time = 0;
{
- /* WORKAROUND: Check the mouse event timestamp so we can ignore mousemove events that were
+ /* WORKAROUND: Check the mouse event timestamp so we can ignore mouse-move events that were
* already in the queue before we changed the cursor position. */
MOUSEMOVEPOINT mp = {x_screen, y_screen};
::GetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &mp, &mp, 1, GMMP_USE_DISPLAY_POINTS);
@@ -1117,7 +1117,7 @@ GHOST_EventCursor *GHOST_SystemWin32::processCursorEvent(GHOST_WindowWin32 *wind
window->getCursorGrabAccum(x_accum, y_accum);
if (x_new != x_screen || y_new != y_screen) {
- /* WORKAROUND: Store the current time so that we ignore outdated mousemove events. */
+ /* WORKAROUND: Store the current time so that we ignore outdated mouse-move events. */
last_warp_time = ::GetTickCount64();
/* For more control over which timestamp to store in the event, we use `SendInput` instead of
diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index c283ea828e8..26cec31e177 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -890,8 +890,8 @@ static void key_evaluate_relative(const int start,
end = tot;
}
- /* in case of beztriple */
- elemstr[0] = 1; /* nr of ipofloats */
+ /* In case of Bezier-triple. */
+ elemstr[0] = 1; /* Number of IPO-floats. */
elemstr[1] = IPO_BEZTRIPLE;
elemstr[2] = 0;
@@ -1132,8 +1132,8 @@ static void do_key(const int start,
}
}
- /* in case of beztriple */
- elemstr[0] = 1; /* nr of ipofloats */
+ /* In case of bezier-triples. */
+ elemstr[0] = 1; /* Number of IPO-floats. */
elemstr[1] = IPO_BEZTRIPLE;
elemstr[2] = 0;
diff --git a/source/blender/draw/engines/basic/shaders/infos/basic_depth_info.hh b/source/blender/draw/engines/basic/shaders/infos/basic_depth_info.hh
index 64988274e03..a14d2cc71e8 100644
--- a/source/blender/draw/engines/basic/shaders/infos/basic_depth_info.hh
+++ b/source/blender/draw/engines/basic/shaders/infos/basic_depth_info.hh
@@ -31,7 +31,7 @@ GPU_SHADER_CREATE_INFO(basic_curves)
.vertex_source("basic_depth_curves_vert.glsl")
.additional_info("draw_hair");
-/* Geometry-shader alterantive paths. */
+/* Geometry-shader alternative paths. */
GPU_SHADER_CREATE_INFO(basic_mesh_conservative_no_geom)
.vertex_in(0, Type::VEC3, "pos")
.vertex_source("basic_depth_vert_conservative_no_geom.glsl")
diff --git a/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h b/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
index 291094bb997..f49c750fbc0 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
+++ b/source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
@@ -9,7 +9,7 @@ typedef struct CommonUniformBlock CommonUniformBlock;
#endif
#ifdef GPU_SHADER
-/* Catch for non-create info cass. */
+/* Catch for non-create info case. */
# ifndef BLI_STATIC_ASSERT_ALIGN
# define BLI_STATIC_ASSERT_ALIGN(type, alignment)
# endif
diff --git a/source/blender/editors/asset/intern/asset_indexer.cc b/source/blender/editors/asset/intern/asset_indexer.cc
index 247db565f36..7db23161926 100644
--- a/source/blender/editors/asset/intern/asset_indexer.cc
+++ b/source/blender/editors/asset/intern/asset_indexer.cc
@@ -324,7 +324,8 @@ static void init_value_from_file_indexer_entries(DictionaryValue &result,
for (LinkNode *ln = indexer_entries.entries; ln; ln = ln->next) {
const FileIndexerEntry *indexer_entry = static_cast<const FileIndexerEntry *>(ln->link);
- /* We also get non asset types (brushes, workspaces), when browsing using the asset browser. */
+ /* We also get non asset types (brushes, work-spaces), when browsing using the asset browser.
+ */
if (indexer_entry->datablock_info.asset_data == nullptr) {
continue;
}
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index b2864f2a6cc..59f348f6d8a 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -582,8 +582,8 @@ void ED_mesh_report_mirror_ex(struct wmOperator *op, int totmirr, int totfail, c
struct Mesh *ED_mesh_context(struct bContext *C);
/**
- * Split all edges that would appear sharp based onface and edge sharpness tags and the auto smooth
- * angle.
+ * Split all edges that would appear sharp based on face and edge sharpness tags and the
+ * auto smooth angle.
*/
void ED_mesh_split_faces(struct Mesh *mesh);
More information about the Bf-blender-cvs
mailing list