[Bf-blender-cvs] [331cc4b66ef] temp-pbvh-split: Cleanup: spelling in comments/strings

Campbell Barton noreply at git.blender.org
Fri Jun 3 01:16:28 CEST 2022


Commit: 331cc4b66ef4e8962d35b7f038fac52186545881
Author: Campbell Barton
Date:   Wed May 11 17:01:06 2022 +1000
Branches: temp-pbvh-split
https://developer.blender.org/rB331cc4b66ef4e8962d35b7f038fac52186545881

Cleanup: spelling in comments/strings

D14918 from @linux_dr with some other changes included.

===================================================================

M	build_files/cmake/project_info.py
M	intern/cycles/blender/mesh.cpp
M	source/blender/blenkernel/intern/asset_catalog_test.cc
M	source/blender/blenlib/tests/BLI_path_util_test.cc
M	source/blender/imbuf/intern/anim_movie.c

===================================================================

diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py
index 46fd538f675..0661db3a18c 100755
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -170,7 +170,7 @@ def cmake_advanced_info() -> Union[Tuple[List[str], List[Tuple[str, str]]], Tupl
     project_path = create_eclipse_project()
 
     if not exists(project_path):
-        print("Generating Eclipse Prokect File Failed: %r not found" % project_path)
+        print("Generating Eclipse Project File Failed: %r not found" % project_path)
         return None, None
 
     from xml.dom.minidom import parse
diff --git a/intern/cycles/blender/mesh.cpp b/intern/cycles/blender/mesh.cpp
index de67e27923d..c76ce3801d4 100644
--- a/intern/cycles/blender/mesh.cpp
+++ b/intern/cycles/blender/mesh.cpp
@@ -316,7 +316,7 @@ static void fill_generic_attribute(BL::Mesh &b_mesh,
       break;
     }
     case BL::Attribute::domain_EDGE: {
-      /* Averge edge attributes at vertices. */
+      /* Average edge attributes at vertices. */
       const size_t num_verts = b_mesh.vertices.length();
       vector<int> count(num_verts, 0);
 
diff --git a/source/blender/blenkernel/intern/asset_catalog_test.cc b/source/blender/blenkernel/intern/asset_catalog_test.cc
index 11f36e32b74..81eb1786322 100644
--- a/source/blender/blenkernel/intern/asset_catalog_test.cc
+++ b/source/blender/blenkernel/intern/asset_catalog_test.cc
@@ -318,7 +318,7 @@ TEST_F(AssetCatalogTest, load_catalog_path_backslashes)
   const AssetCatalog *found_by_id = service.find_catalog(UUID_POSES_ELLIE_BACKSLASHES);
   ASSERT_NE(nullptr, found_by_id);
   EXPECT_EQ(AssetCatalogPath("character/Ellie/backslashes"), found_by_id->path)
-      << "Backslashes should be normalised when loading from disk.";
+      << "Backslashes should be normalized when loading from disk.";
   EXPECT_EQ(StringRefNull("Windows For Life!"), found_by_id->simple_name);
 
   const AssetCatalog *found_by_path = service.find_catalog_by_path("character/Ellie/backslashes");
diff --git a/source/blender/blenlib/tests/BLI_path_util_test.cc b/source/blender/blenlib/tests/BLI_path_util_test.cc
index bfd297214c0..4f6f4a5c413 100644
--- a/source/blender/blenlib/tests/BLI_path_util_test.cc
+++ b/source/blender/blenlib/tests/BLI_path_util_test.cc
@@ -663,7 +663,7 @@ TEST(path_util, PathContains)
   EXPECT_TRUE(BLI_path_contains("/some/path", "/some/path/inside"))
       << "A path contains its subdirectory";
   EXPECT_TRUE(BLI_path_contains("/some/path", "/some/path/../path/inside"))
-      << "Paths should be normalised";
+      << "Paths should be normalized";
   EXPECT_TRUE(BLI_path_contains("C:\\some\\path", "C:\\some\\path\\inside"))
       << "Windows paths should be supported as well";
 
@@ -672,7 +672,7 @@ TEST(path_util, PathContains)
   EXPECT_FALSE(BLI_path_contains("/some/path", "/"))
       << "Root directory not be contained in a subdirectory";
   EXPECT_FALSE(BLI_path_contains("/some/path", "/some/path/../outside"))
-      << "Paths should be normalised";
+      << "Paths should be normalized";
   EXPECT_FALSE(BLI_path_contains("/some/path", "/some/path_library"))
       << "Just sharing a suffix is not enough, path semantics should be followed";
   EXPECT_FALSE(BLI_path_contains("/some/path", "./contents"))
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 096089d4c41..0052ce19aa1 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -423,7 +423,7 @@ static int startavi(struct anim *anim)
   anim->cur_position = 0;
 
 #  if 0
-  printf("x:%d y:%d size:%d interl:%d dur:%d\n",
+  printf("x:%d y:%d size:%d interlace:%d dur:%d\n",
          anim->x,
          anim->y,
          anim->framesize,



More information about the Bf-blender-cvs mailing list