[Bf-blender-cvs] [bc65c7d0e57] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Fri Sep 24 03:39:02 CEST 2021
Commit: bc65c7d0e579c19169baf8be609afa066712c2cc
Author: Campbell Barton
Date: Fri Sep 24 11:31:23 2021 +1000
Branches: master
https://developer.blender.org/rBbc65c7d0e579c19169baf8be609afa066712c2cc
Cleanup: spelling in comments
===================================================================
M intern/cycles/render/gpu_display.h
M intern/cycles/render/osl.cpp
M intern/cycles/util/util_debug.h
M intern/ghost/intern/GHOST_SystemSDL.cpp
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemX11.cpp
M source/blender/blenkernel/BKE_asset.h
M source/blender/blenkernel/BKE_asset_catalog.hh
M source/blender/blenkernel/intern/asset_test.cc
M source/blender/blenkernel/intern/displist.cc
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh_convert.cc
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/scene.c
M source/blender/blenlib/BLI_uuid.h
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/editors/animation/keyingsets.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/screen/area.c
M source/blender/editors/space_clip/tracking_ops_track.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/makesdna/DNA_cloth_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_material_api.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/nodes/intern/node_tree_ref.cc
===================================================================
diff --git a/intern/cycles/render/gpu_display.h b/intern/cycles/render/gpu_display.h
index 0340e0b7e45..3c3cfaea513 100644
--- a/intern/cycles/render/gpu_display.h
+++ b/intern/cycles/render/gpu_display.h
@@ -163,7 +163,7 @@ class GPUDisplay {
* This call might happen in parallel with draw, but can never happen in parallel with the
* update.
*
- * The actual zero-ing can be deferred to a later moment. What is important is that after clear
+ * The actual zeroing can be deferred to a later moment. What is important is that after clear
* and before pixels update the drawing texture will be fully empty, and that partial update
* after clear will write new pixel values for an updating area, leaving everything else zeroed.
*
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index d28b222c10e..5a43b641872 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -727,8 +727,8 @@ void OSLCompiler::add(ShaderNode *node, const char *name, bool isfilepath)
}
}
- /* create shader of the appropriate type. OSL only distinguishes between "surface"
- * and "displacement" atm */
+ /* Create shader of the appropriate type. OSL only distinguishes between "surface"
+ * and "displacement" at the moment. */
if (current_type == SHADER_TYPE_SURFACE)
ss->Shader("surface", name, id(node).c_str());
else if (current_type == SHADER_TYPE_VOLUME)
diff --git a/intern/cycles/util/util_debug.h b/intern/cycles/util/util_debug.h
index 99e2723180c..a2acaea5675 100644
--- a/intern/cycles/util/util_debug.h
+++ b/intern/cycles/util/util_debug.h
@@ -89,7 +89,7 @@ class DebugFlags {
void reset();
/* Whether adaptive feature based runtime compile is enabled or not.
- * Requires the CUDA Toolkit and only works on Linux atm. */
+ * Requires the CUDA Toolkit and only works on Linux at the moment. */
bool adaptive_compile;
};
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp
index 35c7a7ef463..5370d4df857 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp
@@ -374,8 +374,8 @@ void GHOST_SystemSDL::processEvent(SDL_Event *sdl_event)
if (window->getCursorGrabBounds(bounds) == GHOST_kFailure)
window->getClientBounds(bounds);
- /* Could also clamp to screen bounds wrap with a window outside the view will fail atm.
- * Use offset of 8 in case the window is at screen bounds. */
+ /* Could also clamp to screen bounds wrap with a window outside the view will
+ * fail at the moment. Use offset of 8 in case the window is at screen bounds. */
bounds.wrapPoint(x_new, y_new, 8, window->getCursorGrabAxis());
window->getCursorGrabAccum(x_accum, y_accum);
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index f44107ee000..482f20f5cd1 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1100,8 +1100,8 @@ GHOST_EventCursor *GHOST_SystemWin32::processCursorEvent(GHOST_WindowWin32 *wind
window->getClientBounds(bounds);
}
- /* Could also clamp to screen bounds wrap with a window outside the view will fail atm.
- * Use inset in case the window is at screen bounds. */
+ /* Could also clamp to screen bounds wrap with a window outside the view will
+ * fail at the moment. Use inset in case the window is at screen bounds. */
bounds.wrapPoint(x_new, y_new, 2, window->getCursorGrabAxis());
window->getCursorGrabAccum(x_accum, y_accum);
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 10ccb00cc15..c87b745cf40 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -973,8 +973,8 @@ void GHOST_SystemX11::processEvent(XEvent *xe)
if (window->getCursorGrabBounds(bounds) == GHOST_kFailure)
window->getClientBounds(bounds);
- /* Could also clamp to screen bounds wrap with a window outside the view will fail atm.
- * Use offset of 8 in case the window is at screen bounds. */
+ /* Could also clamp to screen bounds wrap with a window outside the view will
+ * fail at the moment. Use offset of 8 in case the window is at screen bounds. */
bounds.wrapPoint(x_new, y_new, 8, window->getCursorGrabAxis());
window->getCursorGrabAccum(x_accum, y_accum);
diff --git a/source/blender/blenkernel/BKE_asset.h b/source/blender/blenkernel/BKE_asset.h
index 7ae5378272d..42eea41b7a7 100644
--- a/source/blender/blenkernel/BKE_asset.h
+++ b/source/blender/blenkernel/BKE_asset.h
@@ -48,7 +48,7 @@ struct AssetTagEnsureResult BKE_asset_metadata_tag_ensure(struct AssetMetaData *
const char *name);
void BKE_asset_metadata_tag_remove(struct AssetMetaData *asset_data, struct AssetTag *tag);
-/** Clean up the catalog ID (whitespaces removed, length reduced, etc.) and assign it. */
+/** Clean up the catalog ID (white-spaces removed, length reduced, etc.) and assign it. */
void BKE_asset_metadata_catalog_id_clear(struct AssetMetaData *asset_data);
void BKE_asset_metadata_catalog_id_set(struct AssetMetaData *asset_data,
bUUID catalog_id,
diff --git a/source/blender/blenkernel/BKE_asset_catalog.hh b/source/blender/blenkernel/BKE_asset_catalog.hh
index 0401fae7126..5fd68e33f4a 100644
--- a/source/blender/blenkernel/BKE_asset_catalog.hh
+++ b/source/blender/blenkernel/BKE_asset_catalog.hh
@@ -69,7 +69,7 @@ class AssetCatalogService {
* still have to be saved.
*
* Return true on success, which either means there were no in-memory categories to save, or the
- * save was succesfful. */
+ * save was successful. */
bool write_to_disk(const CatalogFilePath &directory_for_new_files);
/**
@@ -96,7 +96,7 @@ class AssetCatalogService {
AssetCatalogTree *get_catalog_tree();
- /** Return true iff there are no catalogs known. */
+ /** Return true only if there are no catalogs known. */
bool is_empty() const;
protected:
@@ -196,7 +196,7 @@ class AssetCatalogDefinitionFile {
bool write_to_disk(const CatalogFilePath &dest_file_path) const;
bool contains(CatalogID catalog_id) const;
- /* Add a new catalog. Undefined behaviour if a catalog with the same ID was already added. */
+ /* Add a new catalog. Undefined behavior if a catalog with the same ID was already added. */
void add_new(AssetCatalog *catalog);
using AssetCatalogParsedFn = FunctionRef<bool(std::unique_ptr<AssetCatalog>)>;
@@ -230,9 +230,9 @@ class AssetCatalog {
CatalogPath path;
/**
* Simple, human-readable name for the asset catalog. This is stored on assets alongside the
- * catalog ID; the catalog ID is a UUID that is not human-readable, so to avoid complete dataloss
- * when the catalog definition file gets lost, we also store a human-readable simple name for the
- * catalog. */
+ * catalog ID; the catalog ID is a UUID that is not human-readable,
+ * so to avoid complete data-loss when the catalog definition file gets lost,
+ * we also store a human-readable simple name for the catalog. */
std::string simple_name;
struct Flags {
@@ -242,7 +242,7 @@ class AssetCatalog {
} flags;
/**
- * Create a new Catalog with the given path, auto-generating a sensible catalog simplename.
+ * Create a new Catalog with the given path, auto-generating a sensible catalog simple-name.
*
* NOTE: the given path will be cleaned up (trailing spaces removed, etc.), so the returned
* `AssetCatalog`'s path differ from the given one.
diff --git a/source/blender/blenkernel/intern/asset_test.cc b/source/blender/blenkernel/intern/asset_test.cc
index f1bf21a4f83..77b98a8ac0a 100644
--- a/source/blender/blenkernel/intern/asset_test.cc
+++ b/source/blender/blenkernel/intern/asset_test.cc
@@ -42,7 +42,7 @@ TEST(AssetMetadataTest, set_catalog_id)
EXPECT_TRUE(BLI_uuid_equal(uuid, meta.catalog_id));
EXPECT_STREQ("simple", meta.catalog_simple_name);
- /* Test whitespace trimming. */
+ /* Test white-space trimming. */
BKE_asset_metadata_catalog_id_set(&meta, uuid, " Govoriš angleško? ");
EXPECT_STREQ("Govoriš angleško?", meta.catalog_simple_name);
@@ -52,7 +52,7 @@ TEST(AssetMetadataTest, set_catalog_id)
BKE_asset_metadata_catalog_id_set(&meta, uuid, len66);
EXPECT_STREQ(len63, meta.catalog_simple_name);
- /* Test length trimming happens after whitespace trimming. */
+ /* Test length trimming happens after white-space trimming. */
constexpr char len68[] =
" \
000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20 ";
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index 79e913d266f..0776f3b9a68 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -261,7 +261,7 @@ bool BKE_displist_surfindex_get(
return true;
}
-/* ****************** make displists ********************* */
+/* ****************** Make #DispList ********************* */
#ifdef __INTEL_COMPILER
/* ICC with the optimization -02 causes crashes. */
# pragma intel optimization_level 1
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index d75b3259148..2bad47f2ed1 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -317,7 +317,7 @@ static bool setError(DynamicPaintCanvasSettings *canvas, const char *string)
static int dynamicPaint_surfaceNumOfPoints(DynamicPaintSurface *surface)
{
if (surface->format == MOD_DPAINT_SURFACE_F_PTEX) {
- return 0; /* not supported atm */
+ return 0; /* Not supported at the moment. */
}
if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) {
const Mesh *canvas_mesh = dynamicPaint_canvas_mesh_get(surface->canvas);
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modif
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list