[Bf-blender-cvs] [79290f51605] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Tue Sep 28 23:39:04 CEST 2021
Commit: 79290f51605e31cff09e4984d4f493d05bfe17e2
Author: Campbell Barton
Date: Wed Sep 29 07:29:15 2021 +1000
Branches: master
https://developer.blender.org/rB79290f51605e31cff09e4984d4f493d05bfe17e2
Cleanup: spelling in comments
===================================================================
M intern/cycles/blender/blender_session.h
M intern/cycles/kernel/device/hip/compat.h
M source/blender/blenkernel/BKE_asset_catalog.hh
M source/blender/blenkernel/BKE_volume.h
M source/blender/blenkernel/intern/asset_catalog_test.cc
M source/blender/blenlib/intern/path_util.c
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/operations/COM_BlurBaseOperation.cc
M source/blender/editors/space_node/drawnode.cc
M source/blender/makesdna/DNA_node_types.h
M source/blender/nodes/composite/node_composite_tree.cc
M source/blender/nodes/composite/nodes/node_composite_brightness.cc
M source/blender/nodes/composite/nodes/node_composite_curves.cc
M source/blender/nodes/composite/nodes/node_composite_defocus.cc
M source/blender/nodes/composite/nodes/node_composite_image.cc
M source/blender/nodes/composite/nodes/node_composite_vecBlur.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_attribute_transfer.cc
M source/blender/nodes/intern/node_common.c
M source/blender/nodes/shader/nodes/node_shader_brightness.c
M source/blender/render/intern/texture_image.c
===================================================================
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h
index fb0e5252e3b..58683ee07a1 100644
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -110,8 +110,7 @@ class BlenderSession {
BL::RenderSettings b_render;
BL::Depsgraph b_depsgraph;
/* NOTE: Blender's scene might become invalid after call
- * free_blender_memory_if_possible().
- */
+ * #free_blender_memory_if_possible(). */
BL::Scene b_scene;
BL::SpaceView3D b_v3d;
BL::RegionView3D b_rv3d;
@@ -147,7 +146,7 @@ class BlenderSession {
protected:
void stamp_view_layer_metadata(Scene *scene, const string &view_layer_name);
- /* Check whether session error happenned.
+ /* Check whether session error happened.
* If so, it is reported to the render engine and true is returned.
* Otherwise false is returned. */
bool check_and_report_session_error();
diff --git a/intern/cycles/kernel/device/hip/compat.h b/intern/cycles/kernel/device/hip/compat.h
index 3644925d5be..95338fe7d6e 100644
--- a/intern/cycles/kernel/device/hip/compat.h
+++ b/intern/cycles/kernel/device/hip/compat.h
@@ -79,7 +79,7 @@ typedef unsigned long long uint64_t;
#define ccl_gpu_global_id_x() (ccl_gpu_block_idx_x * ccl_gpu_block_dim_x + ccl_gpu_thread_idx_x)
#define ccl_gpu_global_size_x() (ccl_gpu_grid_dim_x * ccl_gpu_block_dim_x)
-/* GPU warp synchronizaton */
+/* GPU warp synchronization */
#define ccl_gpu_syncthreads() __syncthreads()
#define ccl_gpu_ballot(predicate) __ballot(predicate)
diff --git a/source/blender/blenkernel/BKE_asset_catalog.hh b/source/blender/blenkernel/BKE_asset_catalog.hh
index 8e6aeec5204..05db3c808cf 100644
--- a/source/blender/blenkernel/BKE_asset_catalog.hh
+++ b/source/blender/blenkernel/BKE_asset_catalog.hh
@@ -302,7 +302,7 @@ class AssetCatalog {
* When this catalog's path is equal to the given path, return true as well.
*
* Note that non-normalized paths (so for example starting or ending with a slash) are not
- * supported, and result in undefined behaviour.
+ * supported, and result in undefined behavior.
*/
bool is_contained_in(const CatalogPath &other_path) const;
diff --git a/source/blender/blenkernel/BKE_volume.h b/source/blender/blenkernel/BKE_volume.h
index d9333996632..5fe0d54c2cf 100644
--- a/source/blender/blenkernel/BKE_volume.h
+++ b/source/blender/blenkernel/BKE_volume.h
@@ -18,7 +18,7 @@
/** \file
* \ingroup bke
- * \brief Volume datablock.
+ * \brief Volume data-block.
*/
#ifdef __cplusplus
extern "C" {
@@ -37,7 +37,7 @@ struct VolumeGridVector;
void BKE_volumes_init(void);
-/* Datablock Management */
+/* Data-block Management */
void BKE_volume_init_grids(struct Volume *volume);
void *BKE_volume_add(struct Main *bmain, const char *name);
@@ -122,13 +122,13 @@ void BKE_volume_grid_transform_matrix(const struct VolumeGrid *grid, float mat[4
/* Volume Editing
*
- * These are intended for modifiers to use on evaluated datablocks.
+ * These are intended for modifiers to use on evaluated data-blocks.
*
- * new_for_eval creates a volume datablock with no grids or file path, but
+ * new_for_eval creates a volume data-block with no grids or file path, but
* preserves other settings such as viewport display options.
*
- * copy_for_eval creates a volume datablock preserving everything except the
- * file path. Grids are shared with the source datablock, not copied. */
+ * copy_for_eval creates a volume data-block preserving everything except the
+ * file path. Grids are shared with the source data-block, not copied. */
struct Volume *BKE_volume_new_for_eval(const struct Volume *volume_src);
struct Volume *BKE_volume_copy_for_eval(struct Volume *volume_src, bool reference);
diff --git a/source/blender/blenkernel/intern/asset_catalog_test.cc b/source/blender/blenkernel/intern/asset_catalog_test.cc
index a833e7903fa..9ac2c9f5512 100644
--- a/source/blender/blenkernel/intern/asset_catalog_test.cc
+++ b/source/blender/blenkernel/intern/asset_catalog_test.cc
@@ -175,7 +175,7 @@ TEST_F(AssetCatalogTest, load_single_file)
AssetCatalogService service(asset_library_root_);
service.load_from_disk(asset_library_root_ + "/" + "blender_assets.cats.txt");
- // Test getting a non-existant catalog ID.
+ // Test getting a non-existent catalog ID.
EXPECT_EQ(nullptr, service.find_catalog(BLI_uuid_generate_random()));
// Test getting an invalid catalog (without path definition).
@@ -677,7 +677,7 @@ TEST_F(AssetCatalogTest, delete_catalog_leaf)
{"character/Ružena", 1},
{"character/Ružena/poselib", 2},
{"character/Ružena/poselib/face", 3},
- // {"character/Ružena/poselib/hand", 3}, // this is the deleted one
+ // {"character/Ružena/poselib/hand", 3}, // This is the deleted one.
{"path", 0},
{"path/without", 1},
{"path/without/simplename", 2},
@@ -754,7 +754,7 @@ TEST_F(AssetCatalogTest, merge_catalog_files)
TestableAssetCatalogService service(asset_library_root_);
service.load_from_disk(cdf_dir);
- // Copy a modified file, to mimick a situation where someone changed the CDF after we loaded it.
+ // Copy a modified file, to mimic a situation where someone changed the CDF after we loaded it.
ASSERT_EQ(0, BLI_copy(modified_cdf_file.c_str(), temp_cdf_file.c_str()));
// Overwrite the modified file. This should merge the on-disk file with our catalogs.
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 4405f25bf2a..066749f3a94 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1962,7 +1962,7 @@ bool BLI_path_contains(const char *container_path, const char *containee_path)
}
/* Add a trailing slash to prevent same-prefix directories from matching.
- * e.g. "/some/path" doesn't contain "/some/pathlib". */
+ * e.g. "/some/path" doesn't contain "/some/path_lib". */
BLI_path_slash_ensure(container_native);
return BLI_str_startswith(containee_native, container_native);
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index 4d6c5790987..9e173f73f63 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -695,8 +695,9 @@ class MemoryBuffer {
return y >= m_rect.ymin && y < m_rect.ymax;
}
- /* Fast floor functions. The caller should check result is within buffer bounds. It ceils in near
- * cases and when given coordinate is negative and less than buffer rect `min - 1`. */
+ /* Fast `floor(..)` functions. The caller should check result is within buffer bounds.
+ * It `ceil(..)` in near cases and when given coordinate
+ * is negative and less than buffer rect `min - 1`. */
int floor_x(float x) const
{
return (int)(x + to_positive_x_stride_) - to_positive_x_stride_;
diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cc b/source/blender/compositor/operations/COM_BlurBaseOperation.cc
index 2c162425f13..412632e2e22 100644
--- a/source/blender/compositor/operations/COM_BlurBaseOperation.cc
+++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cc
@@ -228,7 +228,7 @@ void BlurBaseOperation::determine_canvas(const rcti &preferred_area, rcti &r_are
}
case eExecutionModel::FullFrame: {
/* Setting a modifier ensures all non main inputs have extended bounds as preferred
- * canvas, avoiding unnecessary canvas convertions that would hide constant
+ * canvas, avoiding unnecessary canvas conversions that would hide constant
* operations. */
set_determined_canvas_modifier([=](rcti &canvas) {
/* Rounding to even prevents jiggling in backdrop while switching size values. */
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index 9e6662855cc..500e23e5451 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -1563,7 +1563,7 @@ static void node_composit_buts_antialiasing(uiLayout *layout, bContext *UNUSED(C
uiItemR(col, ptr, "corner_rounding", 0, nullptr, ICON_NONE);
}
-/* qdn: glare node */
+/* glare node */
static void node_composit_buts_glare(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
{
uiItemR(layout, ptr, "glare_type", DEFAULT_FLAGS, "", ICON_NONE);
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index ffa6cb307b8..35be6a4b48e 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -855,7 +855,7 @@ typedef struct NodeVertexCol {
char name[64];
} NodeVertexCol;
-/* qdn: Defocus blur node */
+/** Defocus blur node. */
typedef struct NodeDefocus {
char bktype, _pad0, preview, gamco;
short samples, no_zbuf;
@@ -871,7 +871,7 @@ typedef struct NodeScriptDict {
void *node;
} NodeScriptDict;
-/* qdn: glare node */
+/** glare node. */
typedef struct NodeGlare {
char quality, type, iter;
/* XXX angle is only kept for backward/forward compatibility,
@@ -882,14 +882,14 @@ typedef struct NodeGlare {
char _pad1[4];
} NodeGlare;
-/* qdn: tonemap node */
+/** Tonemap node. */
typedef struct NodeTonemap {
float key, offset, gamma;
float f, m, a, c;
int type;
} NodeTonemap;
-/* qdn: lens distortion node */
+/** Lens distortion node. */
typedef struct NodeLensDist {
short jit, proj, fit;
char _pad[2];
diff --git a/source/blender/nodes/composite/node_composite_tree.cc b/source/blender/nodes/composite/node_composite_tree.cc
index d695096903f..ea54673faee 100644
--- a/source/blender/nodes/composite/node_composite_tree.cc
+++ b/source/blender/nodes/composite/node_composite_tree.cc
@@ -315,7 +315,7 @@ void ntreeCompositTagRender(Scene *scene)
if (node->id == (ID *)scene || node->type == CMP_NODE_COMPOSITE) {
nodeUpdate(sce_iter->nodetree, node);
}
- else if (node->type == CMP_NODE_TEXTURE) /* uses scene sizex/sizey */ {
+ else if (node->type == CMP_NODE_TEXTURE) /* uses scene size_x/si
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list