From a3a6d6a670f1074de3a83fef2f58c72bd66b270d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 16 Nov 2020 16:48:41 +1100 Subject: Cleanup: spelling --- source/blender/blenkernel/intern/gpencil_curve.c | 2 +- source/blender/blenkernel/intern/softbody.c | 2 +- source/blender/editors/undo/memfile_undo.c | 14 +++++++------- source/blender/makesdna/DNA_color_types.h | 4 ++-- source/blender/render/intern/engine.c | 4 ++-- source/blender/render/intern/render_result.c | 6 ++++-- source/blender/render/intern/texture_image.c | 6 +++--- source/blender/sequencer/intern/sequencer.c | 4 ++-- 8 files changed, 22 insertions(+), 20 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c index 59c251197eb..8cc11468771 100644 --- a/source/blender/blenkernel/intern/gpencil_curve.c +++ b/source/blender/blenkernel/intern/gpencil_curve.c @@ -560,7 +560,7 @@ void BKE_gpencil_convert_curve(Main *bmain, /** \} */ /* -------------------------------------------------------------------- */ -/** \name Editcurve kernel functions +/** \name Edit-Curve Kernel Functions * \{ */ static bGPDcurve *gpencil_stroke_editcurve_generate_edgecases(bGPDstroke *gps, diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index efed9453003..25d812884bc 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3321,7 +3321,7 @@ static void softbody_reset(Object *ob, SoftBody *sb, float (*vertexCos)[3], int bp->vec[0] = bp->vec[1] = bp->vec[2] = 0.0f; /* the bp->prev*'s are for rolling back from a canceled try to propagate in time - * adaptive step size algo in a nutshell: + * adaptive step size algorithm in a nutshell: * 1. set scheduled time step to new dtime * 2. try to advance the scheduled time step, being optimistic execute it * 3. check for success diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c index ace82f82a78..49417a54472 100644 --- a/source/blender/editors/undo/memfile_undo.c +++ b/source/blender/editors/undo/memfile_undo.c @@ -312,19 +312,19 @@ struct MemFile *ED_undosys_stack_memfile_get_active(UndoStack *ustack) } /** - * If the last undo step is a memfile one, find the first memchunk matching given ID (using its - * seesion uuid), and tag it as 'changed in the future'. + * If the last undo step is a memfile one, find the first #MemFileChunk matching given ID + * (using its session UUID), and tag it as "changed in the future". * * Since non-memfile undos cannot automatically set this flag in the previous step as done with * memfile ones, this has to be called manually by relevant undo code. * - * \note Only current known case for this is undoing a switch from Pbject to Sculpt mode (see + * \note Only current known case for this is undoing a switch from Object to Sculpt mode (see * T82388). * - * \note Calling this ID by ID is not optimal, as it will loop over all memchunks until it find - * expected one. If this becomes an issue we'll have to add a mapping from session uuid to first - * memchunk in #MemFile itself (currently we only do that in #MemFileWriteData when writing a new - * step). + * \note Calling this ID by ID is not optimal, as it will loop over all #MemFile.chunks until it + * finds the expected one. If this becomes an issue we'll have to add a mapping from session UUID + * to first #MemFileChunk in #MemFile itself + * (currently we only do that in #MemFileWriteData when writing a new step). */ void ED_undosys_stack_memfile_id_changed_tag(UndoStack *ustack, ID *id) { diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index 5577a17c0df..ff419e1794e 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -61,9 +61,9 @@ typedef struct CurveMap { /** Display and evaluate table. */ CurveMapPoint *table; - /** For RGB curves, premulled table. */ + /** For RGB curves, pre-multiplied table. */ CurveMapPoint *premultable; - /** For RGB curves, premulled extrapolation vector. */ + /** For RGB curves, pre-multiplied extrapolation vector. */ float premul_ext_in[2]; float premul_ext_out[2]; } CurveMap; diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c index 84f12b7873b..769077c0e8c 100644 --- a/source/blender/render/intern/engine.c +++ b/source/blender/render/intern/engine.c @@ -376,8 +376,8 @@ void RE_engine_end_result( pa->status = (!cancel && merge_results) ? PART_STATUS_MERGED : PART_STATUS_RENDERED; } else if (re->result->do_exr_tile) { - /* if written result does not match any tile and we are using save - * buffers, we are going to get openexr save errors */ + /* If written result does not match any tile and we are using save + * buffers, we are going to get OpenEXR save errors. */ fprintf(stderr, "RenderEngine.end_result: dimensions do not match any OpenEXR tile.\n"); } } diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c index 990373bafa0..dfce51ec3ab 100644 --- a/source/blender/render/intern/render_result.c +++ b/source/blender/render/intern/render_result.c @@ -737,8 +737,10 @@ static int order_render_passes(const void *a, const void *b) return (rpa->view_id < rpb->view_id); } -/* From imbuf, if a handle was returned and - * it's not a singlelayer multiview we convert this to render result. */ +/** + * From imbuf, if a handle was returned and + * it's not a single-layer multi-view we convert this to render result. + */ RenderResult *render_result_new_from_exr( void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty) { diff --git a/source/blender/render/intern/texture_image.c b/source/blender/render/intern/texture_image.c index f0663b07a3c..5614318afbb 100644 --- a/source/blender/render/intern/texture_image.c +++ b/source/blender/render/intern/texture_image.c @@ -327,7 +327,7 @@ int imagewrap(Tex *tex, texres->ta = 1.0f - texres->ta; } - /* de-premul, this is being premulled in shade_input_do_shade() + /* de-premul, this is being pre-multiplied in shade_input_do_shade() * do not de-premul for generated alpha, it is already in straight */ if (texres->ta != 1.0f && texres->ta > 1e-4f && !(tex->imaflag & TEX_CALCALPHA)) { fx = 1.0f / texres->ta; @@ -1441,7 +1441,7 @@ static int imagewraposa_aniso(Tex *tex, texres->nor[2] = 2.0f * (texres->tb - 0.5f); } - /* de-premul, this is being premulled in shade_input_do_shade() + /* de-premul, this is being pre-multiplied in shade_input_do_shade() * TXF: this currently does not (yet?) work properly, destroys edge AA in clip/checker mode, * so for now commented out also disabled in imagewraposa() * to be able to compare results with blender's default texture filtering */ @@ -1970,7 +1970,7 @@ int imagewraposa(Tex *tex, texres->nor[2] = 2.0f * (texres->tb - 0.5f); } - /* de-premul, this is being premulled in shade_input_do_shade() */ + /* de-premul, this is being pre-multiplied in shade_input_do_shade() */ /* do not de-premul for generated alpha, it is already in straight */ if (texres->ta != 1.0f && texres->ta > 1e-4f && !(tex->imaflag & TEX_CALCALPHA)) { mul_v3_fl(&texres->tr, 1.0f / texres->ta); diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c index 155c35c2491..0ebf8f3c8e7 100644 --- a/source/blender/sequencer/intern/sequencer.c +++ b/source/blender/sequencer/intern/sequencer.c @@ -54,7 +54,7 @@ static void seq_free_animdata(Scene *scene, Sequence *seq); /* -------------------------------------------------------------------- */ -/** \name Alloc / free functions +/** \name Allocate / Free Functions * \{ */ static Strip *seq_strip_alloc(int type) @@ -304,7 +304,7 @@ static void seq_new_fix_links_recursive(Sequence *seq) /** \} */ /* -------------------------------------------------------------------- */ -/** \name Duplicate functions +/** \name Duplicate Functions * \{ */ static Sequence *seq_dupli(const Scene *scene_src, Scene *scene_dst, -- cgit v1.2.3