[Bf-blender-cvs] [36d6aa428f4] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Wed Jul 1 06:57:52 CEST 2020
Commit: 36d6aa428f4848cfb153b34bdc4921ee9cabb227
Author: Campbell Barton
Date: Wed Jul 1 13:12:24 2020 +1000
Branches: master
https://developer.blender.org/rB36d6aa428f4848cfb153b34bdc4921ee9cabb227
Cleanup: spelling
===================================================================
M intern/cycles/kernel/svm/svm_noise.h
M intern/libmv/libmv/multiview/projection_test.cc
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/crazyspace.c
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/fcurve_driver.c
M source/blender/blenkernel/intern/lib_override.c
M source/blender/blenlib/BLI_hash.hh
M source/blender/blenlib/BLI_hash_tables.hh
M source/blender/blenlib/intern/math_rotation.c
M source/blender/bmesh/intern/bmesh_mesh_convert.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/draw/engines/basic/basic_engine.c
M source/blender/draw/engines/gpencil/gpencil_cache_utils.c
M source/blender/draw/engines/overlay/overlay_engine.c
M source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl
M source/blender/draw/engines/workbench/workbench_engine.c
M source/blender/draw/engines/workbench/workbench_private.h
M source/blender/draw/engines/workbench/workbench_transparent.c
M source/blender/draw/intern/draw_manager_data.c
M source/blender/editors/armature/armature_relations.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/include/ED_screen_types.h
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/screen/workspace_layout_edit.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/space_view3d/view3d_camera_control.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_project.c
M source/blender/editors/transform/transform_convert.c
M source/blender/editors/transform/transform_convert_mask.c
M source/blender/editors/transform/transform_convert_mesh.c
M source/blender/editors/transform/transform_data.h
M source/blender/io/alembic/exporter/abc_writer_abstract.h
M source/blender/io/alembic/exporter/abc_writer_mesh.h
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/nodes/intern/node_socket.cc
M source/blender/windowmanager/intern/wm.c
===================================================================
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h
index 914ef2089a9..7db8ffcc6e1 100644
--- a/intern/cycles/kernel/svm/svm_noise.h
+++ b/intern/cycles/kernel/svm/svm_noise.h
@@ -573,8 +573,8 @@ ccl_device_inline ssef quad_mix(avxf p, avxf q, ssef f)
*
* Point Offset from v0
* v0 (0, 0, 0)
- * v1 (0, 0, 1) The full avx type is computed by inserting the following
- * v2 (0, 1, 0) sse types into both the low and high parts of the avx.
+ * v1 (0, 0, 1) The full AVX type is computed by inserting the following
+ * v2 (0, 1, 0) SSE types into both the low and high parts of the AVX.
* v3 (0, 1, 1)
* v4 (1, 0, 0)
* v5 (1, 0, 1) (0, 1, 0, 1) = shuffle<0, 2, 0, 2>(shuffle<2, 2, 2, 2>(V, V + 1))
diff --git a/intern/libmv/libmv/multiview/projection_test.cc b/intern/libmv/libmv/multiview/projection_test.cc
index 460a186e7c4..40e766bfae7 100644
--- a/intern/libmv/libmv/multiview/projection_test.cc
+++ b/intern/libmv/libmv/multiview/projection_test.cc
@@ -68,10 +68,10 @@ TEST(Projection, isInFrontOfCamera) {
Vec4 X_front = GetRandomPoint();
Vec4 X_back = GetRandomPoint();
- X_front(2) = 10; // Any point in the positive Z direction
- // where Z > 1 is infront of the camera.
- X_back(2) = -10; // Any point int he negative Z dirstaion
- // is behind the camera.
+ X_front(2) = 10; /* Any point in the positive Z direction
+ * where Z > 1 is in front of the camera. */
+ X_back(2) = -10; /* Any point in the negative Z direction
+ * is behind the camera. */
bool res_front = isInFrontOfCamera(P, X_front);
bool res_back = isInFrontOfCamera(P, X_back);
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index d99b4fddf2d..e16a9284425 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -217,7 +217,7 @@ typedef struct ModifierTypeInfo {
float (*vertexCos)[3],
int numVerts);
- /* Set deform matrix per vertex for crazyspace correction */
+ /* Set deform matrix per vertex for crazy-space correction */
void (*deformMatricesEM)(struct ModifierData *md,
const struct ModifierEvalContext *ctx,
struct BMEditMesh *editData,
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index f88d1a1ee40..78092884655 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -355,10 +355,10 @@ typedef struct SculptSession {
bool show_face_sets;
/* Painting on deformed mesh */
- bool deform_modifiers_active; /* object is deformed with some modifiers */
- float (*orig_cos)[3]; /* coords of undeformed mesh */
- float (*deform_cos)[3]; /* coords of deformed mesh but without stroke displacement */
- float (*deform_imats)[3][3]; /* crazyspace deformation matrices */
+ bool deform_modifiers_active; /* Object is deformed with some modifiers. */
+ float (*orig_cos)[3]; /* Coords of un-deformed mesh. */
+ float (*deform_cos)[3]; /* Coords of deformed mesh but without stroke displacement. */
+ float (*deform_imats)[3][3]; /* Crazy-space deformation matrices. */
/* Used to cache the render of the active texture */
unsigned int texcache_side, *texcache, texcache_actual;
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 07eff64e51c..080d61f1500 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1119,7 +1119,7 @@ static bool collection_find_instance_recursive(Collection *collection,
{
LISTBASE_FOREACH (CollectionObject *, collection_object, &collection->gobject) {
if (collection_object->ob != NULL &&
- /* Object from a given collection should never instanciate that collection either. */
+ /* Object from a given collection should never instantiate that collection either. */
ELEM(collection_object->ob->instance_collection, instance_collection, collection)) {
return true;
}
@@ -1146,7 +1146,7 @@ bool BKE_collection_find_cycle(Collection *new_ancestor, Collection *collection)
}
}
- /* Find possible objects in collection or its children, that would instanciate the given ancestor
+ /* Find possible objects in collection or its children, that would instantiate the given ancestor
* collection (that would also make a fully invalid cycle of dependencies) .*/
return collection_find_instance_recursive(collection, new_ancestor);
}
diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c
index 4d685a511fd..e4f851819a8 100644
--- a/source/blender/blenkernel/intern/crazyspace.c
+++ b/source/blender/blenkernel/intern/crazyspace.c
@@ -252,7 +252,7 @@ void BKE_crazyspace_set_quats_mesh(Mesh *me,
}
/**
- * Returns an array of deform matrices for crazyspace correction,
+ * Returns an array of deform matrices for crazy-space correction,
* and the number of modifiers left.
*/
int BKE_crazyspace_get_first_deform_matrices_editbmesh(struct Depsgraph *depsgraph,
@@ -327,7 +327,7 @@ int BKE_crazyspace_get_first_deform_matrices_editbmesh(struct Depsgraph *depsgra
}
/**
- * Crazyspace evaluation needs to have an object which has all the fields
+ * Crazy-space evaluation needs to have an object which has all the fields
* evaluated, but the mesh data being at undeformed state. This way it can
* re-apply modifiers and also have proper pointers to key data blocks.
*
@@ -455,8 +455,8 @@ void BKE_crazyspace_build_sculpt(struct Depsgraph *depsgraph,
depsgraph, scene, object, deformmats, deformcos);
if (totleft) {
- /* there are deformation modifier which doesn't support deformation matrices
- * calculation. Need additional crazyspace correction */
+ /* There are deformation modifier which doesn't support deformation matrices calculation.
+ * Need additional crazy-space correction. */
Mesh *mesh = (Mesh *)object->data;
Mesh *mesh_eval = NULL;
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index 3d5f9cad1c1..1a5b7685c0e 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -237,12 +237,13 @@ void BKE_editmesh_lnorspace_update(BMEditMesh *em, Mesh *me)
{
BMesh *bm = em->bm;
- /* We need to create clnors data if none exist yet, otherwise there is no way to edit them.
- * Similar code to MESH_OT_customdata_custom_splitnormals_add operator,
- * we want to keep same shading in case we were using autosmooth so far.
+ /* We need to create custom-loop-normals (CLNORS) data if none exist yet,
+ * otherwise there is no way to edit them.
+ * Similar code to #MESH_OT_customdata_custom_splitnormals_add operator,
+ * we want to keep same shading in case we were using auto-smooth so far.
* Note: there is a problem here, which is that if someone starts a normal editing operation on
- * previously autosmooth-ed mesh, and cancel that operation, generated clnors data remain,
- * with related sharp edges (and hence autosmooth is 'lost').
+ * previously auto-smooth-ed mesh, and cancel that operation, generated CLNORS data remain,
+ * with related sharp edges (and hence auto-smooth is 'lost').
* Not sure how critical this is, and how to fix that issue? */
if (!CustomData_has_layer(&bm->ldata, CD_CUSTOMLOOPNORMAL)) {
if (me->flag & ME_AUTOSMOOTH) {
diff --git a/source/blender/blenkernel/intern/fcurve_driver.c b/source/blender/blenkernel/intern/fcurve_driver.c
index 78a6cf28824..a0625918a62 100644
--- a/source/blender/blenkernel/intern/fcurve_driver.c
+++ b/source/blender/blenkernel/intern/fcurve_driver.c
@@ -484,14 +484,14 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
dtar->flag &= ~DTAR_FLAG_INVALID;
}
- /* try to get posechannel */
+ /* Try to get pose-channel. */
pchan = BKE_pose_channel_find_name(ob->pose, dtar->pchan_name);
- /* check if object or bone, and get transform matrix accordingly
- * - "useEulers" code is used to prevent the problems associated with non-uniqueness
- * of euler decomposition from matrices [#20870]
- * - localspace is for [#21384], where parent results are not wanted
- * but local-consts is for all the common "corrective-shapes-for-limbs" situations
+ /* Check if object or bone, and get transform matrix accordingly:
+ * - "use_eulers" code is used to prevent the problems associated with non-uniqueness
+ * of euler decomposition from matrices T20870.
+ * - "local-space" is for T21384, where parent results are not wanted
+ * but #DTAR_FLAG_LOCAL_CONSTS is for all the common "corrective-shapes-for-limbs" situations.
*/
if (pchan) {
/* bone */
@@ -517,7 +517,7 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
}
}
else {
- /* worldspace matrix */
+ /* World-space matrix. */
mul_m4_m4m4(mat, ob->obmat, pchan->pose_mat);
}
}
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 46eb40e0315..457d096f983 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1076,7 +1076,7 @@ void BKE_lib_override_library_update(Main *bmain, ID *local)
local->tag |= LIB_TAG_OVERRIDE_LIBRARY_REFOK;
/* Full rebuild of Depsgraph! */
- /* Note: this is reallly brute force, in theory updates from RNA should have handle this already,
+ /* Note: this is really brute force, in theory updates from RNA should have handle this already,
* but for now let's play it safe. */
DEG_relations_tag_update(bmain);
}
diff --git a/source/blender/blenlib/BLI_hash.hh b/source/blender/blenlib/BLI_hash.hh
index 5490c953756..49e619ff1bc 100644
--- a/source/blender/blenlib/BLI_hash.hh
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list