[Bf-blender-cvs] [9f8cc1bc349] master: Cleanup: Grammar: a vs an

Hans Goudey noreply at git.blender.org
Mon Jun 20 17:14:28 CEST 2022


Commit: 9f8cc1bc349cb3e48af71e95b60693dfccfe2c82
Author: Hans Goudey
Date:   Mon Jun 20 10:14:00 2022 -0500
Branches: master
https://developer.blender.org/rB9f8cc1bc349cb3e48af71e95b60693dfccfe2c82

Cleanup: Grammar: a vs an

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

M	source/blender/blenkernel/BKE_mesh_remap.h
M	source/blender/blenkernel/intern/mesh_tangent.c
M	source/blender/editors/include/ED_image.h
M	source/blender/gpu/metal/mtl_texture.hh
M	source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
M	source/blender/makesrna/intern/rna_modifier.c

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

diff --git a/source/blender/blenkernel/BKE_mesh_remap.h b/source/blender/blenkernel/BKE_mesh_remap.h
index e2b16a7681d..ee0179c7a77 100644
--- a/source/blender/blenkernel/BKE_mesh_remap.h
+++ b/source/blender/blenkernel/BKE_mesh_remap.h
@@ -42,7 +42,7 @@ void BKE_mesh_remap_free(MeshPairRemap *map);
 void BKE_mesh_remap_item_define_invalid(MeshPairRemap *map, int index);
 
 /* TODO:
- * Add other 'from/to' mapping sources, like e.g. using an UVMap, etc.
+ * Add other 'from/to' mapping sources, like e.g. using a UVMap, etc.
  * https://blenderartists.org/t/619105
  *
  * We could also use similar topology mappings inside a same mesh
diff --git a/source/blender/blenkernel/intern/mesh_tangent.c b/source/blender/blenkernel/intern/mesh_tangent.c
index c0b2b33c47c..a677a0d6ebb 100644
--- a/source/blender/blenkernel/intern/mesh_tangent.c
+++ b/source/blender/blenkernel/intern/mesh_tangent.c
@@ -167,7 +167,7 @@ void BKE_mesh_calc_loop_tangent_single(Mesh *mesh,
   if (!loopuvs) {
     BKE_reportf(reports,
                 RPT_ERROR,
-                "Tangent space computation needs an UVMap, \"%s\" not found, aborting",
+                "Tangent space computation needs a UV Map, \"%s\" not found, aborting",
                 uvmap);
     return;
   }
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index 888bf0d86c5..3e5d4c3adf4 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -140,7 +140,7 @@ bool ED_space_image_check_show_maskedit(struct SpaceImage *sima, struct Object *
 
 /* Returns true when the following conditions are met:
  * - Current space is Image Editor.
- * - The image editor is not an UV Editor.
+ * - The image editor is not a UV Editor.
  * - It is set to Mask mode.
  *
  * It is not required to have mask opened for editing. */
@@ -148,7 +148,7 @@ bool ED_space_image_maskedit_poll(struct bContext *C);
 
 /* Returns true when the following conditions are met:
  * - Current space is Image Editor.
- * - The image editor is not an UV Editor.
+ * - The image editor is not a UV Editor.
  * - It is set to Mask mode.
  * - The space has mask opened. */
 bool ED_space_image_maskedit_mask_poll(struct bContext *C);
diff --git a/source/blender/gpu/metal/mtl_texture.hh b/source/blender/gpu/metal/mtl_texture.hh
index b820256ec36..b4b1e91c496 100644
--- a/source/blender/gpu/metal/mtl_texture.hh
+++ b/source/blender/gpu/metal/mtl_texture.hh
@@ -349,7 +349,7 @@ class MTLTexture : public Texture {
    *    - Per-component size matches (e.g. GPU_DATA_UBYTE)
    *                                OR GPU_DATA_10_11_11_REV && GPU_R11G11B10 (equiv)
    *                                OR D24S8 and GPU_DATA_UINT_24_8
-   *    We can Use BLIT ENCODER.
+   *    We can use BLIT ENCODER.
    *
    * OTHERWISE TRIGGER COMPUTE:
    *  - Compute sizes will vary. Threads per grid WILL match 'extent'.
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
index 6840dfe25de..396ee64454c 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_polyline_info.hh
@@ -37,7 +37,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color)
 
 GPU_SHADER_CREATE_INFO(gpu_shader_3D_polyline_uniform_color_clipped)
     .do_static_compilation(true)
-    /* TODO(fclem): Put in an UBO to fit the 128byte requirement. */
+    /* TODO(fclem): Put in a UBO to fit the 128byte requirement. */
     .push_constant(Type::MAT4, "ModelMatrix")
     .push_constant(Type::VEC4, "ClipPlane")
     .define("CLIP")
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 8591d4abd63..4810784b3f7 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4993,7 +4993,7 @@ static void rna_def_modifier_weightvg_mask(BlenderRNA *UNUSED(brna),
        0,
        "Object",
        "Use local generated coordinates of another object"},
-      {MOD_DISP_MAP_UV, "UV", 0, "UV", "Use coordinates from an UV layer"},
+      {MOD_DISP_MAP_UV, "UV", 0, "UV", "Use coordinates from a UV layer"},
       {0, NULL, 0, NULL, NULL},
   };



More information about the Bf-blender-cvs mailing list