[Bf-blender-cvs] [fd5c185bebd] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Thu Jun 25 15:15:19 CEST 2020
Commit: fd5c185bebd5a418634b2a8846f0aeea86327b20
Author: Campbell Barton
Date: Thu Jun 25 23:13:02 2020 +1000
Branches: master
https://developer.blender.org/rBfd5c185bebd5a418634b2a8846f0aeea86327b20
Cleanup: spelling
===================================================================
M intern/cycles/device/device_multi.cpp
M intern/cycles/kernel/geom/geom_curve_intersect.h
M intern/cycles/render/object.cpp
M source/blender/blenkernel/BKE_screen.h
M source/blender/blenkernel/intern/armature_deform.c
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/lib_id.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/studiolight.c
M source/blender/blenlib/BLI_hash_tables.hh
M source/blender/blenlib/BLI_index_range.hh
M source/blender/blenlib/BLI_listbase_wrapper.hh
M source/blender/blenlib/BLI_map.hh
M source/blender/blenlib/BLI_set.hh
M source/blender/blenlib/BLI_vector.hh
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/math_matrix.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_290.c
M source/blender/bmesh/intern/bmesh_operators.h
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/freestyle/intern/view_map/AutoPtrHelper.h
M source/blender/functions/FN_cpp_type.hh
M source/blender/functions/FN_multi_function_context.hh
M source/blender/functions/intern/multi_function_network_evaluation.cc
M source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c
M source/blender/makesdna/DNA_key_types.h
M source/blender/makesdna/DNA_shader_fx_types.h
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_ui_common.c
M source/blender/shader_fx/intern/FX_ui_common.c
M source/creator/creator.c
===================================================================
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index 020b9e10e60..fd14bbdccc5 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -396,8 +396,8 @@ class MultiDevice : public Device {
size_t existing_size = mem.device_size;
/* This is a hack to only allocate the tile buffers on denoising devices
- * Similarily the tile buffers also need to be allocated separately on all devices so any
- * overlap rendered for denoising does not interfer with each other */
+ * Similarly the tile buffers also need to be allocated separately on all devices so any
+ * overlap rendered for denoising does not interfere with each other */
if (strcmp(mem.name, "RenderBuffers") == 0) {
vector<device_ptr> device_pointers;
device_pointers.reserve(devices.size());
diff --git a/intern/cycles/kernel/geom/geom_curve_intersect.h b/intern/cycles/kernel/geom/geom_curve_intersect.h
index 86f7f246c6e..c04dbee52cc 100644
--- a/intern/cycles/kernel/geom/geom_curve_intersect.h
+++ b/intern/cycles/kernel/geom/geom_curve_intersect.h
@@ -20,7 +20,7 @@ CCL_NAMESPACE_BEGIN
/* Curve primitive intersection functions.
*
* The code here was adapted from curve_intersector_sweep.h in Embree, to get
- * an exact match betwee Embree CPU ray-tracing and our GPU ray-tracing. */
+ * an exact match between Embree CPU ray-tracing and our GPU ray-tracing. */
#define CURVE_NUM_BEZIER_SUBDIVISIONS 3
#define CURVE_NUM_BEZIER_SUBDIVISIONS_UNSTABLE (CURVE_NUM_BEZIER_SUBDIVISIONS + 1)
@@ -176,7 +176,7 @@ ccl_device bool curve_intersect_iterative(const float3 ray_dir,
{
const float length_ray_dir = len(ray_dir);
- /* Error of curve evaluations is propertional to largest coordinate. */
+ /* Error of curve evaluations is proportional to largest coordinate. */
const float4 box_min = min(min(curve[0], curve[1]), min(curve[2], curve[3]));
const float4 box_max = max(min(curve[0], curve[1]), max(curve[2], curve[3]));
const float4 box_abs = max(fabs(box_min), fabs(box_max));
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 405af57effc..c45ae5553a8 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -594,7 +594,7 @@ void ObjectManager::device_update_transforms(DeviceScene *dscene, Scene *scene,
numparticles += psys->particles.size();
}
- /* Parallel object update, with grain size to avoid too much threadng overhead
+ /* Parallel object update, with grain size to avoid too much threading overhead
* for individual objects. */
static const int OBJECTS_PER_TASK = 32;
parallel_for(blocked_range<size_t>(0, scene->objects.size(), OBJECTS_PER_TASK),
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 6b3217a2bea..91f241018ec 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -213,7 +213,7 @@ typedef struct PanelType {
char context[BKE_ST_MAXNAME]; /* for buttons window */
char category[BKE_ST_MAXNAME]; /* for category tabs */
char owner_id[BKE_ST_MAXNAME]; /* for work-spaces to selectively show. */
- char parent_id[BKE_ST_MAXNAME]; /* parent idname for subpanels */
+ char parent_id[BKE_ST_MAXNAME]; /* parent idname for sub-panels */
short space_type;
short region_type;
/* For popovers, 0 for default. */
diff --git a/source/blender/blenkernel/intern/armature_deform.c b/source/blender/blenkernel/intern/armature_deform.c
index e757e30e524..44b50ab96d3 100644
--- a/source/blender/blenkernel/intern/armature_deform.c
+++ b/source/blender/blenkernel/intern/armature_deform.c
@@ -349,8 +349,7 @@ static void armature_vert_task_with_dvert(const ArmatureUserdata *data,
pchan_bone_deform(pchan, weight, vec, dq, smat, co, &contrib);
}
}
- /* if there are vertexgroups but not groups with bones
- * (like for softbody groups) */
+ /* If there are vertex-groups but not groups with bones (like for soft-body groups). */
if (deformed == 0 && use_envelope) {
for (pchan = data->ob_arm->pose->chanbase.first; pchan; pchan = pchan->next) {
if (!(pchan->bone->flag & BONE_NO_DEFORM)) {
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index dddbf7d45b2..c38d38bb2e7 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -416,11 +416,12 @@ static Collection *collection_duplicate_recursive(Main *bmain,
}
/**
- * Make a deep copy (aka duplicate) of the given collection and all of its children, recusrsively.
+ * Make a deep copy (aka duplicate) of the given collection and all of its children, recursively.
*
* \warning This functions will clear all \a bmain #ID.idnew pointers, unless \a
- * LIB_ID_DUPLICATE_IS_SUBPROCESS duplicate option is passed on, in which case caller is reponsible
- * to reconstruct collection dependencies informations (i.e. call #BKE_main_collection_sync).
+ * #LIB_ID_DUPLICATE_IS_SUBPROCESS duplicate option is passed on, in which case caller is
+ * responsible to reconstruct collection dependencies information's
+ * (i.e. call #BKE_main_collection_sync).
*
* \param do_objects: If true, it will also make copies of objects.
* \param do_obdata: If true, it will also make duplicates of objects,
@@ -444,8 +445,8 @@ Collection *BKE_collection_duplicate(Main *bmain,
bmain, parent, collection, duplicate_flags, duplicate_options);
if (!is_subprocess) {
- /* `collection_duplicate_recursive` will also tag our 'root' collection, whic is not required
- * unless its duplication is a subprocess of another one. */
+ /* `collection_duplicate_recursive` will also tag our 'root' collection, which is not required
+ * unless its duplication is a sub-process of another one. */
collection_new->id.tag &= ~LIB_TAG_NEW;
/* This code will follow into all ID links using an ID tagged with LIB_TAG_NEW.*/
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 74e3cc567ec..06c28776840 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -5415,10 +5415,10 @@ static bConstraint *add_new_constraint_internal(const char *name, short type)
con->flag |= CONSTRAINT_OVERRIDE_LIBRARY_LOCAL;
con->enforce = 1.0f;
- /* Only open the main panel when constraints are created, not the subpanels. */
+ /* Only open the main panel when constraints are created, not the sub-panels. */
con->ui_expand_flag = (1 << 0);
if (ELEM(type, CONSTRAINT_TYPE_ACTION, CONSTRAINT_TYPE_SPLINEIK)) {
- /* Expand the two subpanels in the cases where the main panel barely has any properties. */
+ /* Expand the two sub-panels in the cases where the main panel barely has any properties. */
con->ui_expand_flag |= (1 << 1) | (1 << 2);
}
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index ce98d76531f..9e2e91dc33a 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -160,7 +160,7 @@ static void lib_id_clear_library_data_ex(Main *bmain, ID *id)
BKE_lib_libblock_session_uuid_renew(id);
/* We need to tag this IDs and all of its users, conceptually new local ID and original linked
- * ones are two completely different data-blocks that were virtually remaped, even though in
+ * ones are two completely different data-blocks that were virtually remapped, even though in
* reality they remain the same data. For undo this info is critical now. */
DEG_id_tag_update_ex(bmain, id, ID_RECALC_COPY_ON_WRITE);
ID *id_iter;
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 7c77746ea1c..327e8bfca7a 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -141,7 +141,7 @@ ModifierData *BKE_modifier_new(int type)
md->type = type;
md->mode = eModifierMode_Realtime | eModifierMode_Render;
md->flag = eModifierFlag_OverrideLibrary_Local;
- md->ui_expand_flag = 1; /* Only open the main panel at the beginning, not the subpanels. */
+ md->ui_expand_flag = 1; /* Only open the main panel at the beginning, not the sub-panels. */
if (mti->flags & eModifierTypeFlag_EnableInEditmode) {
md->mode |= eModifierMode_Editmode;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 94b677c649c..b589db33edb 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -4787,7 +4787,7 @@ void psys_get_dupli_texture(ParticleSystem *psys,
int num;
/* XXX: on checking '(psmd->dm != NULL)'
- * This is incorrect but needed for metaball evaluation.
+ * This is incorrect but needed for meta-ball evaluation.
* Ideally this would be calculated via the depsgraph, however with meta-balls,
* the entire scenes dupli's are scanned, which also looks into uncalculated data.
*
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c
index 4892e8d6ede..8455b60c894 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -1426,9 +1426,9 @@ void BKE_studiolight_init(void)
BLI_addtail(&studiolights, sl);
- /* go over the preset folder and add a studiolight for every image with its path */
- /* for portable installs (where USER and SYSTEM paths are the same),
- * only go over LOCAL datafiles once */
+ /* Go over the preset folder and add a studio-light for every image with its path. */
+ /* For portable installs (where USER and SYSTEM paths are the same),
+ * only go over LOCAL data-files once. */
/* Also reserve icon space for it. */
if (!BKE_appdir_app_is_portable_install()) {
studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES,
diff --git a/source/blender/blenlib/BLI_hash_tables.hh b/source/blender/blenlib/BLI_hash_tables
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list