[Bf-blender-cvs] [e85635b8825] master: Cleanup: comment spelling
Campbell Barton
noreply at git.blender.org
Mon Jun 17 01:11:31 CEST 2019
Commit: e85635b8825f9ca52a43408b58c5f66c4e3742e6
Author: Campbell Barton
Date: Sun Jun 16 13:37:21 2019 +1000
Branches: master
https://developer.blender.org/rBe85635b8825f9ca52a43408b58c5f66c4e3742e6
Cleanup: comment spelling
===================================================================
M intern/cycles/bvh/bvh_embree.cpp
M intern/cycles/kernel/kernel_random.h
M source/blender/blenkernel/BKE_global.h
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/tracking_stabilize.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenloader/intern/writefile.c
M source/blender/collada/BCAnimationCurve.cpp
M source/blender/collada/EffectExporter.cpp
M source/blender/depsgraph/DEG_depsgraph_query.h
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/modes/edit_mesh_mode.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/mesh/mesh_mirror.c
M source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
M source/blender/freestyle/intern/scene_graph/TriangleRep.h
M source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
M source/blender/freestyle/intern/view_map/Silhouette.h
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/cineon/cineon_dpx.c
M source/blender/imbuf/intern/jpeg.c
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_movieclip_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_workspace_types.h
M source/blender/makesrna/intern/rna_space.c
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index 53f0b35a103..36d8a226722 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -29,7 +29,7 @@
* get a separate RTCDevice to correctly keep track of memory usage.
*
* Vertex and index buffers are duplicated between Cycles device arrays and Embree. These could be
- * merged, which would requrie changes to intersection refinement, shader setup, mesh light
+ * merged, which would require changes to intersection refinement, shader setup, mesh light
* sampling and a few other places in Cycles where direct access to vertex data is required.
*/
diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h
index 6779c1f7160..78eafbfe3cb 100644
--- a/intern/cycles/kernel/kernel_random.h
+++ b/intern/cycles/kernel/kernel_random.h
@@ -244,7 +244,7 @@ ccl_device_inline void path_branched_rng_2D(KernelGlobals *kg,
fy);
}
-/* Utitility functions to get light termination value,
+/* Utility functions to get light termination value,
* since it might not be needed in many cases.
*/
ccl_device_inline float path_state_rng_light_termination(KernelGlobals *kg,
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 9fe8fc3880f..bee76c09cbc 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -75,7 +75,7 @@ typedef struct Global {
* * 666: Use quicker batch delete for outliners' delete hierarchy (01/2019).
* * 777: Enable UI node panel's sockets polling (11/2011).
* * 799: Enable some mysterious new depsgraph behavior (05/2015).
- * * 1112: Disable new Cloth internal springs hanlding (09/2014).
+ * * 1112: Disable new Cloth internal springs handling (09/2014).
* * 1234: Disable new dyntopo code fixing skinny faces generation (04/2015).
* * 16384 and above: Reserved for python (add-ons) usage.
*/
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index f0fd1203cae..f53700fbfb0 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -1387,9 +1387,11 @@ static void loop_split_worker(TaskPool *__restrict pool, void *taskdata, int UNU
#endif
}
-/* Check whether gievn loop is part of an unknown-so-far cyclic smooth fan, or not.
+/**
+ * Check whether given loop is part of an unknown-so-far cyclic smooth fan, or not.
* Needed because cyclic smooth fans have no obvious 'entry point',
- * and yet we need to walk them once, and only once. */
+ * and yet we need to walk them once, and only once.
+ */
static bool loop_split_generator_check_cyclic_smooth_fan(const MLoop *mloops,
const MPoly *mpolys,
const int (*edge_to_loops)[2],
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c
index 695f9b21559..88b81392189 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.c
+++ b/source/blender/blenkernel/intern/tracking_stabilize.c
@@ -496,7 +496,7 @@ static float rotation_contribution(TrackStabilizationBase *track_ref,
* Currently, the public API functions do not support this flexibility.
* Rather, rotation will always be applied around a fixed origin.
* As a workaround, we shift the image after rotation to match the
- * desired rotation centre. And since this offset needs to be applied
+ * desired rotation center. And since this offset needs to be applied
* after the rotation and scaling, we can collapse it with the
* translation compensation, which is also a lateral shift (offset).
* The offset to apply is intended_pivot - rotated_pivot
@@ -640,9 +640,9 @@ static bool average_track_contributions(StabContext *ctx,
/* Calculate weight center of location tracks for given frame.
* This function performs similar calculations as average_track_contributions(),
- * but does not require the tracks to be initialized for stabilisation. Moreover,
+ * but does not require the tracks to be initialized for stabilization. Moreover,
* when there is no usable tracking data for the given frame number, data from
- * a neighbouring frame is used. Thus this function can be used to calculate
+ * a neighboring frame is used. Thus this function can be used to calculate
* a starting point on initialization.
*/
static void average_marker_positions(StabContext *ctx, int framenr, float r_ref_pos[2])
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 98e8a5ee425..f43f55a352b 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -210,8 +210,8 @@ MINLINE axis_t max_axis(axis_t a, axis_t b)
#endif
/**
- * Introsort
- * with permission deriven from the following Java code:
+ * Intro-sort
+ * with permission deriving from the following Java code:
* http://ralphunden.net/content/tutorials/a-guide-to-introsort/
* and he derived it from the SUN STL
*/
@@ -603,7 +603,9 @@ static void build_implicit_tree_helper(const BVHTree *tree, BVHBuildHelper *data
data->remain_leafs = remain + nnodes;
}
-// return the min index of all the leafs archivable with the given branch
+/**
+ * Return the min index of all the leafs achievable with the given branch.
+ */
static int implicit_leafs_index(const BVHBuildHelper *data, const int depth, const int child_index)
{
int min_leaf_index = child_index * data->leafs_per_child[depth - 1];
@@ -623,14 +625,14 @@ static int implicit_leafs_index(const BVHBuildHelper *data, const int depth, con
* Generalized implicit tree build
*
* An implicit tree is a tree where its structure is implied,
- * thus there is no need to store child pointers or indexs.
+ * thus there is no need to store child pointers or indexes.
* Its possible to find the position of the child or the parent with simple maths
- * (multiplication and adittion).
+ * (multiplication and addition).
* This type of tree is for example used on heaps..
- * where node N has its childs at indexs N*2 and N*2+1.
+ * where node N has its child at indices N*2 and N*2+1.
*
- * Although in this case the tree type is general.. and not know until runtime.
- * tree_type stands for the maximum number of childs that a tree node can have.
+ * Although in this case the tree type is general.. and not know until run-time.
+ * tree_type stands for the maximum number of children that a tree node can have.
* All tree types >= 2 are supported.
*
* Advantages of the used trees include:
@@ -1792,7 +1794,7 @@ void BLI_bvhtree_ray_cast_all(BVHTree *tree,
/* -------------------------------------------------------------------- */
/** \name BLI_bvhtree_range_query
*
- * Allocs and fills an array with the indexs of node that are on the given spherical range
+ * Allocates and fills an array with the indices of node that are on the given spherical range
* (center, radius).
* Returns the size of the array.
*
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 6b231c4916d..5dbd2a52d07 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -2532,7 +2532,7 @@ bool isect_sweeping_sphere_tri_v3(const float p1[3],
}
/*---test edges---*/
- sub_v3_v3v3(e3, v2, v1); /* wasnt yet calculated */
+ sub_v3_v3v3(e3, v2, v1); /* wasn't yet calculated */
/*e1*/
sub_v3_v3v3(bv, v0, p1);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index cd5cd66dc61..115387a697b 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1040,7 +1040,7 @@ static void write_nodetree_nolib(WriteData *wd, bNodeTree *ntree)
/* pass */
}
else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_GLARE)) {
- /* Simple forward compat for fix for T50736.
+ /* Simple forward compatibility for fix for T50736.
* Not ideal (there is no ideal solution here), but should do for now. */
NodeGlare *ndg = node->storage;
/* Not in undo case. */
diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/collada/BCAnimationCurve.cpp
index 1ea63508965..b494c749fe3 100644
--- a/source/blender/collada/BCAnimationCurve.cpp
+++ b/source/blender/collada/BCAnimationCurve.cpp
@@ -398,7 +398,7 @@ bool BCAnimationCurve::add_value_from_matrix(const BCSample &sample, const int f
{
int array_index = curve_key.get_array_index();
- /* transformation curves are feeded directly from the transformation matrix
+ /* transformation curves are fed directly from the transformation matrix
* to resolve parent inverse matrix issues with object hierarchies.
* Maybe this can be unified with the
*/
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp
index a0ad3740e45..394c79bb988 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -274,7 +274,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
int i = im_samp_map[key];
std::string uvname = strlen(t->uvname) ? t->uvname : active_uv;
COLLADASW::Sampler *sampler = (COLLADASW::Sampler *)
- samp_surf[i]; // possibly uninitialised memory ...
+ samp_surf[i]; // possibly uninitialized memory ...
writeTextures(ep, key, sampler, t, ima, uvname);
}
#endif
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h
index bd59ebcd869..00bb02d7205 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -92,7 +92,7 @@ struct Scene *DEG_get_evaluated_scene(const struct Depsgraph *graph);
*
* Use in exceptional case if it's absolutely must to.
*
- * Allows to pass depsgraph == NULL, wil lreturn
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list