[Bf-blender-cvs] [9f6b19526de] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Fri Jan 28 04:53:36 CET 2022
Commit: 9f6b19526de8b69bf8015b835f358dd8c2eb6449
Author: Campbell Barton
Date: Fri Jan 28 13:59:08 2022 +1100
Branches: master
https://developer.blender.org/rB9f6b19526de8b69bf8015b835f358dd8c2eb6449
Cleanup: spelling in comments
Also minor wording improvements.
===================================================================
M build_files/cmake/platform/platform_unix.cmake
M source/blender/blenlib/intern/voronoi_2d.c
M source/blender/draw/intern/draw_instance_data.c
M source/blender/draw/intern/draw_manager.c
M source/blender/gpu/intern/gpu_shader_dependency.cc
M source/blender/io/usd/intern/usd_writer_material.cc
M source/blender/io/usd/intern/usd_writer_material.h
M source/blender/makesrna/intern/rna_object_api.c
===================================================================
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 6d595865659..6a896709cc2 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -112,7 +112,7 @@ if(NOT WITH_SYSTEM_FREETYPE)
# NOTE: This is done on WIN32 & APPLE but fails on some Linux systems.
# See: https://devtalk.blender.org/t/22536
- # So `BROTLI_LIBRARIES` need to be added `FREETYPE_LIBRARIES`.
+ # So `BROTLI_LIBRARIES` need to be added directly after `FREETYPE_LIBRARIES`.
#
# list(APPEND FREETYPE_LIBRARIES
# ${BROTLI_LIBRARIES}
diff --git a/source/blender/blenlib/intern/voronoi_2d.c b/source/blender/blenlib/intern/voronoi_2d.c
index 5b998973a20..65f9994bce7 100644
--- a/source/blender/blenlib/intern/voronoi_2d.c
+++ b/source/blender/blenlib/intern/voronoi_2d.c
@@ -777,7 +777,7 @@ static void voronoi_addTriangle(
*r_triangles = MEM_reallocN(*r_triangles, sizeof(int[3]) * (*r_triangles_total + 1));
}
else {
- *r_triangles = MEM_callocN(sizeof(int[3]), "trianglulation triangles");
+ *r_triangles = MEM_callocN(sizeof(int[3]), "triangulation triangles");
}
triangle = (int *)&(*r_triangles)[(*r_triangles_total)];
diff --git a/source/blender/draw/intern/draw_instance_data.c b/source/blender/draw/intern/draw_instance_data.c
index 7e1d1208698..ca01a99c0d3 100644
--- a/source/blender/draw/intern/draw_instance_data.c
+++ b/source/blender/draw/intern/draw_instance_data.c
@@ -80,7 +80,7 @@ typedef struct DRWTempInstancingHandle {
GPUBatch *batch;
/** Batch containing instancing attributes. */
GPUBatch *instancer;
- /** Callbuffer to be used instead of instancer. */
+ /** Call-buffer to be used instead of instancer. */
GPUVertBuf *buf;
/** Original non-instanced batch pointer. */
GPUBatch *geom;
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 45e4c2a575e..1249004eda0 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1482,7 +1482,7 @@ void DRW_draw_callbacks_post_scene(void)
* Don't trust them! */
DRW_state_reset();
- /* needed so gizmo isn't obscured */
+ /* Needed so gizmo isn't occluded. */
if ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) {
GPU_depth_test(GPU_DEPTH_NONE);
DRW_draw_gizmo_3d();
diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc
index e8c9a1e6e52..3965d796647 100644
--- a/source/blender/gpu/intern/gpu_shader_dependency.cc
+++ b/source/blender/gpu/intern/gpu_shader_dependency.cc
@@ -199,7 +199,7 @@ struct GPUSource {
*
* IMPORTANT: This has some requirements:
* - Enums needs to have underlying types specified to uint32_t to make them usable in UBO/SSBO.
- * - All values needs to be specified using constant literals to avoid compiler differencies.
+ * - All values needs to be specified using constant literals to avoid compiler differences.
* - All values needs to have the 'u' suffix to avoid GLSL compiler errors.
*/
void enum_preprocess(void)
diff --git a/source/blender/io/usd/intern/usd_writer_material.cc b/source/blender/io/usd/intern/usd_writer_material.cc
index af448dc7794..52ad349fb98 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -440,7 +440,7 @@ static pxr::TfToken get_node_tex_image_color_space(bNode *node)
return pxr::TfToken();
}
-/* Search the upstream nodes connected to the given socket and return the first occurrance
+/* Search the upstream nodes connected to the given socket and return the first occurrence
* of the node of the given type. Return null if no node of this type was found. */
static bNode *traverse_channel(bNodeSocket *input, const short target_type)
{
@@ -464,7 +464,7 @@ static bNode *traverse_channel(bNodeSocket *input, const short target_type)
return nullptr;
}
-/* Returns the first occurence of a principled bsdf or a diffuse bsdf node found in the given
+/* Returns the first occurrence of a principled BSDF or a diffuse BSDF node found in the given
* material's node tree. Returns null if no instance of either type was found.*/
static bNode *find_bsdf_node(Material *material)
{
diff --git a/source/blender/io/usd/intern/usd_writer_material.h b/source/blender/io/usd/intern/usd_writer_material.h
index b2c732963dc..435ac41c4bf 100644
--- a/source/blender/io/usd/intern/usd_writer_material.h
+++ b/source/blender/io/usd/intern/usd_writer_material.h
@@ -31,17 +31,19 @@ namespace blender::io::usd {
struct USDExporterContext;
-/* Entry point to create an approximate USD Preview Surface network from a Cycles node graph.
+/**
+ * Entry point to create an approximate USD Preview Surface network from a Cycles node graph.
* Due to the limited nodes in the USD Preview Surface specification, only the following nodes
* are supported:
- * - UVMap
- * - Texture Coordinate
- * - Image Texture
- * - Principled BSDF
+ * - UVMap
+ * - Texture Coordinate
+ * - Image Texture
+ * - Principled BSDF
* More may be added in the future.
*
- * The 'default_uv' paramter is used as the default UV set name sampled by the primvar
- * reader shaders generated for image texture nodes that don't have an attached UVMAp node. */
+ * \param default_uv: used as the default UV set name sampled by the `primvar`
+ * reader shaders generated for image texture nodes that don't have an attached UVMap node.
+ */
void create_usd_preview_surface_material(const USDExporterContext &usd_export_context,
Material *material,
pxr::UsdShadeMaterial &usd_material,
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index cc9f6454337..dbf9b757728 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -1012,7 +1012,7 @@ void RNA_api_object(StructRNA *srna)
parm, "", "The ortho scale to aim to be able to see all given points (if relevant)");
RNA_def_parameter_flags(parm, 0, PARM_OUTPUT);
- /* Crazyspace access. */
+ /* Crazy-space access. */
func = RNA_def_function(srna, "crazyspace_eval", "rna_Object_crazyspace_eval");
RNA_def_function_ui_description(
More information about the Bf-blender-cvs
mailing list