[Bf-blender-cvs] [5badf165317] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Thu Sep 10 01:49:01 CEST 2020
Commit: 5badf1653173a23607244ebbda72c710860ea795
Author: Campbell Barton
Date: Thu Sep 10 09:45:25 2020 +1000
Branches: master
https://developer.blender.org/rB5badf1653173a23607244ebbda72c710860ea795
Cleanup: spelling
===================================================================
M intern/cycles/render/svm.h
M intern/cycles/util/util_task.h
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/nla.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/string_search.cc
M source/blender/bmesh/operators/bmo_bisect_plane.c
M source/blender/compositor/operations/COM_BokehImageOperation.h
M source/blender/depsgraph/intern/depsgraph_physics.cc
M source/blender/draw/engines/basic/basic_engine.c
M source/blender/draw/engines/eevee/shaders/closure_lib.glsl
M source/blender/draw/engines/external/external_engine.c
M source/blender/editors/gpencil/gpencil_sculpt_paint.c
M source/blender/editors/uvedit/uvedit_parametrizer.c
M source/blender/makesrna/intern/rna_rna.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/windowmanager/intern/wm_dragdrop.c
===================================================================
diff --git a/intern/cycles/render/svm.h b/intern/cycles/render/svm.h
index 61923fc40ac..dd557de52d6 100644
--- a/intern/cycles/render/svm.h
+++ b/intern/cycles/render/svm.h
@@ -87,9 +87,7 @@ class SVMCompiler {
/* Total time spent on all routines. */
double time_total;
- /* A full multiline description of the state of the compiler after
- * compilation.
- */
+ /* A full multi-line description of the state of the compiler after compilation. */
string full_report() const;
};
diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h
index a56ca62f62c..d3c3c11f8e2 100644
--- a/intern/cycles/util/util_task.h
+++ b/intern/cycles/util/util_task.h
@@ -47,7 +47,7 @@ class TaskPool {
/* Number of all tasks handled by this pool. */
int num_tasks_handled;
- /* A full multiline description of the state of the pool after
+ /* A full multi-line description of the state of the pool after
* all work is done.
*/
string full_report() const;
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 05ab03d75a2..1ad34fde0fa 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -1248,7 +1248,7 @@ void BKE_layer_collection_local_sync(ViewLayer *view_layer, const View3D *v3d)
}
/**
- * Sync the local collection for all the viewports.
+ * Sync the local collection for all the view-ports.
*/
void BKE_layer_collection_local_sync_all(const Main *bmain)
{
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 0c3abc70a43..b7d6c7a5a28 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -1284,12 +1284,11 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip)
nls->start = strip->end;
}
else {
- /* shrink transition down to 1 frame long (so that it can still be found),
- * then offset everything else by the remaining defict to give the strip room
- */
+ /* Shrink transition down to 1 frame long (so that it can still be found),
+ * then offset everything else by the remaining deficit to give the strip room. */
nls->start = nls->end - 1.0f;
- /* XXX: review whether preventing fractionals is good here... */
+ /* XXX: review whether preventing fractional values is good here... */
offset = ceilf(strip->end - nls->start);
/* apply necessary offset to ensure that the strip has enough space */
@@ -1333,12 +1332,11 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip)
nls->end = strip->start;
}
else {
- /* shrink transition down to 1 frame long (so that it can still be found),
- * then offset everything else by the remaining defict to give the strip room
- */
+ /* Shrink transition down to 1 frame long (so that it can still be found),
+ * then offset everything else by the remaining deficit to give the strip room. */
nls->end = nls->start + 1.0f;
- /* XXX: review whether preventing fractionals is good here... */
+ /* XXX: review whether preventing fractional values is good here... */
offset = ceilf(nls->end - strip->start);
/* apply necessary offset to ensure that the strip has enough space */
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 92c5af127fc..6c950c4b33f 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1529,20 +1529,17 @@ static int evaluate_seq_frame_gen(Sequence **seq_arr, ListBase *seqbase, int cfr
/* Drop strips which are used for effect inputs, we don't want
* them to blend into render stack in any other way than effect
- * string rendering.
- */
+ * string rendering. */
for (LinkNode *seq_item = effect_inputs.list; seq_item; seq_item = seq_item->next) {
Sequence *seq = seq_item->link;
- /* It's possible that effetc strip would be placed to the same
+ /* It's possible that effect strip would be placed to the same
* 'machine' as it's inputs. We don't want to clear such strips
- * from the stack.
- */
+ * from the stack. */
if (seq_arr[seq->machine] && seq_arr[seq->machine]->type & SEQ_TYPE_EFFECT) {
continue;
}
- /* If we're shown a specified channel, then we want to see the stirps
- * which belongs to this machine.
- */
+ /* If we're shown a specified channel, then we want to see the strips
+ * which belongs to this machine. */
if (chanshown != 0 && chanshown <= seq->machine) {
continue;
}
@@ -1776,7 +1773,7 @@ static void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile)
seq->strip->colorspace_settings.name);
}
- /* no individual view files - monoscopic, stereo 3d or exr multiview */
+ /* No individual view files - monoscopic, stereo 3d or EXR multi-view. */
totfiles = 1;
}
@@ -1829,7 +1826,7 @@ static bool seq_proxy_get_custom_file_fname(Sequence *seq, char *name, const int
if (view_id > 0) {
BLI_snprintf(suffix, sizeof(suffix), "_%d", view_id);
/* TODO(sergey): This will actually append suffix after extension
- * which is weird but how was originally coded in multiview branch.
+ * which is weird but how was originally coded in multi-view branch.
*/
BLI_snprintf(name, PROXY_MAXFILE, "%s_%s", fname, suffix);
}
@@ -1855,7 +1852,7 @@ static bool seq_proxy_get_fname(Editing *ed,
return false;
}
- /* Multiview suffix. */
+ /* Multi-view suffix. */
if (view_id > 0) {
BLI_snprintf(suffix, sizeof(suffix), "_%d", view_id);
}
@@ -2566,7 +2563,9 @@ static void *color_balance_do_thread(void *thread_data_v)
return NULL;
}
-/* cfra is offset by fra_offset only in case we are using a real mask. */
+/**
+ * \a cfra is offset by \a fra_offset only in case we are using a real mask.
+ */
ImBuf *BKE_sequencer_render_mask_input(const SeqRenderData *context,
int mask_input_type,
Sequence *mask_sequence,
@@ -2968,7 +2967,7 @@ static ImBuf *seq_render_effect_strip_impl(const SeqRenderData *context,
break;
case EARLY_DO_EFFECT:
for (i = 0; i < 3; i++) {
- /* Speed effect requires time remapping of cfra for input(s). */
+ /* Speed effect requires time remapping of `cfra` for input(s). */
if (input[0] && seq->type == SEQ_TYPE_SPEED) {
float target_frame = BKE_sequencer_speed_effect_target_frame_get(context, seq, cfra, i);
ibuf[i] = seq_render_strip(context, state, input[0], target_frame);
@@ -3013,7 +3012,9 @@ static ImBuf *seq_render_effect_strip_impl(const SeqRenderData *context,
return out;
}
-/* Render individual view for multiview or single (default view) for monoview. */
+/**
+ * Render individual view for multi-view or single (default view) for mono-view.
+ */
static ImBuf *seq_render_image_strip_view(const SeqRenderData *context,
Sequence *seq,
char *name,
@@ -3048,7 +3049,7 @@ static ImBuf *seq_render_image_strip_view(const SeqRenderData *context,
imb_freerectImBuf(ibuf);
}
- /* All sequencer color is done in SRGB space, linear gives odd crossfades. */
+ /* All sequencer color is done in SRGB space, linear gives odd cross-fades. */
BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, false);
return ibuf;
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 1ebbc1e2d77..88b32e194cf 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -211,7 +211,7 @@ static float sb_time_scale(Object *ob)
* will cause unwanted responses of the softbody system (which does inter frame calculations )
* so first 'cure' would be: interpolate linear in time ..
* Q: why do i write this?
- * A: because it happened once, that some eger coder 'streamlined' code to fail.
+ * A: because it happened once, that some eager coder 'streamlined' code to fail.
* We DO linear interpolation for goals .. and i think we should do on animated properties as well
*/
diff --git a/source/blender/blenlib/intern/string_search.cc b/source/blender/blenlib/intern/string_search.cc
index 17da3b9f493..d64587b85b4 100644
--- a/source/blender/blenlib/intern/string_search.cc
+++ b/source/blender/blenlib/intern/string_search.cc
@@ -108,7 +108,7 @@ int damerau_levenshtein_distance(StringRef a, StringRef b)
*/
int get_fuzzy_match_errors(StringRef query, StringRef full)
{
- /* If it is a perfect partial match, return immediatly. */
+ /* If it is a perfect partial match, return immediately. */
if (full.find(query) != StringRef::not_found) {
return 0;
}
@@ -180,8 +180,8 @@ int get_fuzzy_match_errors(StringRef query, StringRef full)
* So "bose" does not match "select boundary". However, individual words can be skipped. For
* example, "rocc" matches "rotate edge ccw".
*
- * Returns true when the match was successfull. If it was successfull, the used words are tagged in
- * r_word_is_matched.
+ * \return true when the match was successful.
+ * If it was successful, the used words are tagged in \a r_word_is_matched.
*/
static bool match_word_initials(StringRef query,
Span<StringRef> words,
@@ -384,7 +384,7 @@ void extract_normalized_words(StringRef str,
}
offset += size;
}
- /* If the last word is not followed by a separator, it has to be handld separately. */
+ /* If the last word is not followed by a separator, it has to be handled separately. */
if (is_in_word) {
r_words.append(str_copy.drop_prefix(static_cast<int>(word_start)));
}
diff --git a/source/blender/bmesh/operators/bmo_bisect_plane.c b/source/blender/bmesh/operators/bmo_bisect_plane.c
index ef59ebf1f2f..337437fb607 100644
--- a/so
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list