Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-09-29 00:29:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-09-29 00:29:15 +0300
commit79290f51605e31cff09e4984d4f493d05bfe17e2 (patch)
tree77a9513a2c85012ac805f38c1083c423c36c72f1 /source/blender/blenkernel
parentefe3a13b55c0295b68697c19e4379b5bbe8684ca (diff)
Cleanup: spelling in comments
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_asset_catalog.hh2
-rw-r--r--source/blender/blenkernel/BKE_volume.h12
-rw-r--r--source/blender/blenkernel/intern/asset_catalog_test.cc6
3 files changed, 10 insertions, 10 deletions
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.