[Bf-blender-cvs] [4e45265dc6c] master: Cleanup: spelling in comments & strings
Campbell Barton
noreply at git.blender.org
Tue Nov 30 00:18:14 CET 2021
Commit: 4e45265dc6cafe0bf6f36a14a469288183059858
Author: Campbell Barton
Date: Tue Nov 30 09:04:50 2021 +1100
Branches: master
https://developer.blender.org/rB4e45265dc6cafe0bf6f36a14a469288183059858
Cleanup: spelling in comments & strings
===================================================================
M intern/cycles/blender/session.cpp
M intern/cycles/device/optix/device_impl.cpp
M intern/cycles/kernel/bvh/bvh.h
M intern/cycles/kernel/types.h
M source/blender/blenkernel/BKE_blendfile_link_append.h
M source/blender/blenkernel/BKE_bpath.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/intern/blendfile_link_append.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/lib_id.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenlib/BLI_virtual_array.hh
M source/blender/blenloader/BLO_undofile.h
M source/blender/blenloader/BLO_writefile.h
M source/blender/blenloader/intern/versioning_300.c
M source/blender/depsgraph/intern/node/deg_node.h
M source/blender/editors/asset/intern/asset_indexer.cc
M source/blender/editors/asset/intern/asset_ops.cc
M source/blender/editors/include/ED_file_indexer.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_view.cc
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/space_file/asset_catalog_tree_view.cc
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/filesel.c
M source/blender/editors/undo/memfile_undo.c
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/blender/makesdna/DNA_effect_types.h
M source/blender/makesdna/DNA_outliner_types.h
M source/blender/makesdna/DNA_pointcache_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
M source/blender/nodes/intern/derived_node_tree.cc
M source/blender/python/bmesh/bmesh_py_types.c
M source/blender/python/gpu/gpu_py_offscreen.c
M source/blender/windowmanager/message_bus/wm_message_bus.h
===================================================================
diff --git a/intern/cycles/blender/session.cpp b/intern/cycles/blender/session.cpp
index 2c4e57404b8..b8165186b4f 100644
--- a/intern/cycles/blender/session.cpp
+++ b/intern/cycles/blender/session.cpp
@@ -629,7 +629,7 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_,
integrator->set_use_emission((bake_filter & BL::BakeSettings::pass_filter_EMIT) != 0);
}
- /* Always use transpanent background for baking. */
+ /* Always use transparent background for baking. */
scene->background->set_transparent(true);
/* Load built-in images from Blender. */
diff --git a/intern/cycles/device/optix/device_impl.cpp b/intern/cycles/device/optix/device_impl.cpp
index 1d893d9c65b..7a78504f458 100644
--- a/intern/cycles/device/optix/device_impl.cpp
+++ b/intern/cycles/device/optix/device_impl.cpp
@@ -335,7 +335,7 @@ bool OptiXDevice::load_kernels(const uint kernel_features)
# if OPTIX_ABI_VERSION >= 55
builtin_options.builtinISModuleType = OPTIX_PRIMITIVE_TYPE_ROUND_CATMULLROM;
builtin_options.buildFlags = OPTIX_BUILD_FLAG_PREFER_FAST_TRACE;
- builtin_options.curveEndcapFlags = OPTIX_CURVE_ENDCAP_DEFAULT; /* Disable endcaps. */
+ builtin_options.curveEndcapFlags = OPTIX_CURVE_ENDCAP_DEFAULT; /* Disable end-caps. */
# else
builtin_options.builtinISModuleType = OPTIX_PRIMITIVE_TYPE_ROUND_CUBIC_BSPLINE;
# endif
@@ -1281,7 +1281,7 @@ void OptiXDevice::build_bvh(BVH *bvh, Progress &progress, bool refit)
}
else {
/* Disable visibility test any-hit program, since it is already checked during
- * intersection. Those trace calls that require anyhit can force it with a ray flag. */
+ * intersection. Those trace calls that require any-hit can force it with a ray flag. */
build_flags |= OPTIX_GEOMETRY_FLAG_DISABLE_ANYHIT;
build_input.type = OPTIX_BUILD_INPUT_TYPE_CUSTOM_PRIMITIVES;
@@ -1449,7 +1449,7 @@ void OptiXDevice::build_bvh(BVH *bvh, Progress &progress, bool refit)
}
}
# if OPTIX_ABI_VERSION < 55
- /* Cannot disable any-hit program for thick curves, since it needs to filter out endcaps. */
+ /* Cannot disable any-hit program for thick curves, since it needs to filter out end-caps. */
else
# endif
{
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h
index 33d2e44471a..37cfac25060 100644
--- a/intern/cycles/kernel/bvh/bvh.h
+++ b/intern/cycles/kernel/bvh/bvh.h
@@ -250,7 +250,7 @@ ccl_device_intersect bool scene_intersect(KernelGlobals kg,
uint ray_mask = visibility & 0xFF;
if (0 == ray_mask && (visibility & ~0xFF) != 0) {
ray_mask = 0xFF;
- /* No further intersector setup required: Default MetalRT behaviour is anyhit */
+ /* No further intersector setup required: Default MetalRT behavior is any-hit. */
}
else if (visibility & PATH_RAY_SHADOW_OPAQUE) {
/* No further intersector setup required: Shadow ray early termination is controlled by the
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h
index b15230e627f..b44386e0da0 100644
--- a/intern/cycles/kernel/types.h
+++ b/intern/cycles/kernel/types.h
@@ -1204,7 +1204,7 @@ typedef struct KernelIntegrator {
/* Closure filter. */
int filter_closures;
- /* MIS debuging */
+ /* MIS debugging. */
int direct_light_sampling_type;
/* padding */
diff --git a/source/blender/blenkernel/BKE_blendfile_link_append.h b/source/blender/blenkernel/BKE_blendfile_link_append.h
index 9e4a498f5e7..cda6a620326 100644
--- a/source/blender/blenkernel/BKE_blendfile_link_append.h
+++ b/source/blender/blenkernel/BKE_blendfile_link_append.h
@@ -72,13 +72,13 @@ short BKE_blendfile_link_append_context_item_idcode_get(
struct BlendfileLinkAppendContext *lapp_context, struct BlendfileLinkAppendContextItem *item);
typedef enum eBlendfileLinkAppendForeachItemFlag {
- /** Loop over directly linked items (i.e. those explicitely defined by user code). */
+ /** Loop over directly linked items (i.e. those explicitly defined by user code). */
BKE_BLENDFILE_LINK_APPEND_FOREACH_ITEM_FLAG_DO_DIRECT = 1 << 0,
/** Loop over indirectly linked items (i.e. those defined by internal code, as dependencies of
* direct ones).
*
- * IMPORTANT: Those 'indirect' items currently may not cover **all** indrectly linked data. See
- * comments in #foreach_libblock_link_append_callback. */
+ * IMPORTANT: Those 'indirect' items currently may not cover **all** indirectly linked data.
+ * See comments in #foreach_libblock_link_append_callback. */
BKE_BLENDFILE_LINK_APPEND_FOREACH_ITEM_FLAG_DO_INDIRECT = 1 << 0,
} eBlendfileLinkAppendForeachItemFlag;
/** Callback called by #BKE_blendfile_link_append_context_item_foreach over each (or a subset of
diff --git a/source/blender/blenkernel/BKE_bpath.h b/source/blender/blenkernel/BKE_bpath.h
index 984c7f609f6..338aec4ae4f 100644
--- a/source/blender/blenkernel/BKE_bpath.h
+++ b/source/blender/blenkernel/BKE_bpath.h
@@ -22,7 +22,7 @@
*/
/* TODO: Make this module handle a bit more safely string length, instead of assuming buffers are
- * FILE_MAX len etc. */
+ * FILE_MAX length etc. */
#pragma once
@@ -54,13 +54,13 @@ typedef enum eBPathForeachFlag {
* `foreach_path` implementations and/or callbacks to implement specific behaviors. */
/** Skip paths where a single dir is used with an array of files, eg. sequence strip images or
- * pointcaches. In this case only use the first file path is processed.
+ * point-caches. In this case only use the first file path is processed.
*
* This is needed for directory manipulation callbacks which might otherwise modify the same
* directory multiple times. */
BKE_BPATH_FOREACH_PATH_SKIP_MULTIFILE = (1 << 8),
/** Reload data (when the path is edited).
- * \note Ony used by Image IDType currently. */
+ * \note Only used by Image IDType currently. */
BKE_BPATH_FOREACH_PATH_RELOAD_EDITED = (1 << 9),
} eBPathForeachFlag;
@@ -76,7 +76,7 @@ typedef bool (*BPathForeachPathFunctionCallback)(struct BPathForeachPathData *bp
char *r_path_dst,
const char *path_src);
-/** Storage for common data needed accross the BPath 'foreach_path' code. */
+/** Storage for common data needed across the BPath 'foreach_path' code. */
typedef struct BPathForeachPathData {
struct Main *bmain;
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 8be563e4c96..eca6bc38da6 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -98,7 +98,7 @@ typedef enum {
eModifierTypeFlag_RequiresOriginalData = (1 << 5),
/**
- * For modifiers that support pointcache,
+ * For modifiers that support point-cache,
* so we can check to see if it has files we need to deal with.
*/
eModifierTypeFlag_UsesPointCache = (1 << 6),
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c
index fb961dba482..17c44bbd5f5 100644
--- a/source/blender/blenkernel/intern/blendfile_link_append.c
+++ b/source/blender/blenkernel/intern/blendfile_link_append.c
@@ -18,8 +18,8 @@
* \ingroup bke
*
* High level `.blend` file link/append code,
- * including linking/appending several IDs from different libraries, handling instanciations of
- * collections/objects/obdata in current scene.
+ * including linking/appending several IDs from different libraries, handling instantiations of
+ * collections/objects/object-data in current scene.
*/
#include <stdlib.h>
@@ -110,7 +110,7 @@ typedef struct BlendfileLinkAppendContext {
LinkNodePair items;
int num_libraries;
int num_items;
- /** Linking/appending parameters. Including bmain, scene, viewlayer and view3d. */
+ /** Linking/appending parameters. Including `bmain`, `scene`, `viewlayer` and `view3d`. */
LibraryLink_Params *params;
/** Allows to easily find an existing items from an ID pointer. */
@@ -245,7 +245,7 @@ void BKE_blendfile_link_append_context_embedded_blendfile_set(
BlendfileLinkAppendContext *lapp_context, const void *blendfile_mem, int blendfile_memsize)
{
BLI_assert_msg(lapp_context->blendfile_mem == NULL,
- "Please explicitely clear reference to an embedded blender memfile before "
+ "Please explicitly clear reference to an embedded blender memfile before "
"setting a new one");
lapp_context->blendfile_mem = blendfile_mem;
lapp_context->blendfile_memsize = (size_t)blendfile_memsize;
@@ -530,7 +530,7 @@ static void loose_data_instantiate_object_base_instance_init(Main *bmain,
}
/* Tag obdata that actually need to be instantiated (those referenced by an object do not, since
- * the object will be instantiated instaed if needed. */
+ * the object will be instantiated instead if needed. */
static void loose_data_instantiate_obdata_preprocess(
LooseDataInstantiateContext *instantiate_context)
{
@@ -854,7 +854,7 @@ static int foreach_libblock_link_append_callback(LibraryIDLinkCallbackData *cb_d
* processed, so we need to recursively deal with them here. */
/* NOTE: Since we are by-passing checks in `BKE_library_foreach_ID_link` by manually calling it
* recursively, we need to take care of potential recursion cases ourselves (e.g.animdata of
- * shapekey referencing the shapekey itself). */
+ * shape-key referencing the shape-key itself). */
if (id != cb_data->id_self) {
BKE_library_foreach_ID_link(
cb_data->bmain, id, foreach_libblock_link_append_callback, data, IDWALK_NOP);
@@ -946,8 +946,8 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList *
/* Linked IDs should never be marked as needing post-processing (instantiation of loose
* objects etc.).
- * NOTE: This is dev test check, can be removed once we get rid of instantiation code in BLO
- * completely.*/
+ * NOTE: This is a developer test check, can be removed once we get rid of instantiation code
+ * in BLO completely.*/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list