[Bf-blender-cvs] [e00bb5a4b73] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Thu Nov 12 01:39:57 CET 2020
Commit: e00bb5a4b730475fba8e2d14c9f2645af9b88f51
Author: Campbell Barton
Date: Thu Nov 12 11:35:31 2020 +1100
Branches: master
https://developer.blender.org/rBe00bb5a4b730475fba8e2d14c9f2645af9b88f51
Cleanup: spelling
===================================================================
M source/blender/blenkernel/intern/lib_override.c
M source/blender/blenloader/intern/writefile.c
M source/blender/draw/engines/overlay/overlay_image.c
M source/blender/editors/space_outliner/outliner_sync.c
M source/blender/imbuf/intern/rectop.c
M source/blender/render/intern/texture_image.c
M source/blender/sequencer/intern/render.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 15736011f6f..8825d71fc3c 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -528,7 +528,7 @@ static bool lib_override_library_create_do(Main *bmain, ID *id_root)
}
/* Now tag all non-object/collection IDs 'in-between' two tagged ones, as those are part of an
- * override chain and therefore alos need to be overridden.
+ * override chain and therefore also need to be overridden.
* One very common cases are e.g. drivers on geometry or materials of an overridden object, that
* are using another overridden object as parameter. */
/* Note that this call will also free the main relations data we created above. */
@@ -1714,7 +1714,7 @@ void BKE_lib_override_library_update(Main *bmain, ID *local)
/* XXX We need a way to get off-Main copies of IDs (similar to localized mats/texts/ etc.)!
* However, this is whole bunch of code work in itself, so for now plain stupid ID copy
- * will do, as innefficient as it is. :/
+ * will do, as inefficient as it is. :/
* Actually, maybe not! Since we are swapping with original ID's local content, we want to
* keep user-count in correct state when freeing tmp_id
* (and that user-counts of IDs used by 'new' local data also remain correct). */
@@ -1770,8 +1770,8 @@ void BKE_lib_override_library_update(Main *bmain, ID *local)
tmp_key->from = tmp_id;
}
- /* Again, horribly innefficient in our case, we need something off-Main (aka more generic nolib
- * copy/free stuff)! */
+ /* Again, horribly inefficient in our case, we need something off-Main
+ * (aka more generic nolib copy/free stuff)! */
BKE_id_free_ex(bmain, tmp_id, LIB_ID_FREE_NO_UI_USER, true);
if (GS(local->name) == ID_AR) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index b640c9f5788..11fe240620a 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -935,7 +935,7 @@ static bool write_file_handle(Main *mainvar,
write_thumb(wd, thumb);
write_global(wd, write_flags, mainvar);
- /* The windowmanager and screen often change,
+ /* The window-manager and screen often change,
* avoid thumbnail detecting changes because of this. */
mywrite_flush(wd);
diff --git a/source/blender/draw/engines/overlay/overlay_image.c b/source/blender/draw/engines/overlay/overlay_image.c
index 9695f8616a5..844a0eb8351 100644
--- a/source/blender/draw/engines/overlay/overlay_image.c
+++ b/source/blender/draw/engines/overlay/overlay_image.c
@@ -346,9 +346,9 @@ void OVERLAY_image_camera_cache_populate(OVERLAY_Data *vedata, Object *ob)
mul_m4_m4m4(mat, modelmat, mat);
const bool is_foreground = (bgpic->flag & CAM_BGIMG_FLAG_FOREGROUND) != 0;
- /* Alpha is clamped just below 1.0 to fix background images to intefere with foreground
+ /* Alpha is clamped just below 1.0 to fix background images to interfere with foreground
* images. Without this a background image with 1.0 will be rendered on top of a transparent
- * foreground image due to the differnet blending modes they use. */
+ * foreground image due to the different blending modes they use. */
const float color_premult_alpha[4] = {1.0f, 1.0f, 1.0f, MIN2(bgpic->alpha, 0.999999)};
DRWPass *pass = is_foreground ? (use_view_transform ? psl->image_foreground_scene_ps :
diff --git a/source/blender/editors/space_outliner/outliner_sync.c b/source/blender/editors/space_outliner/outliner_sync.c
index 4591a545783..0f5c74a9168 100644
--- a/source/blender/editors/space_outliner/outliner_sync.c
+++ b/source/blender/editors/space_outliner/outliner_sync.c
@@ -257,9 +257,9 @@ static void outliner_select_sync_to_edit_bone(ViewLayer *view_layer,
add_selected_item(selected_ebones, ebone);
}
else if (!is_edit_bone_selected(selected_ebones, ebone)) {
- /* Dont flush to parent bone tip, synced selection is iterating the whole tree so deselecting
- * potential children with 'ED_armature_ebone_select_set(ebone, false)' would leave own tip
- * deselected. */
+ /* Don't flush to parent bone tip, synced selection is iterating the whole tree so
+ * deselecting potential children with `ED_armature_ebone_select_set(ebone, false)`
+ * would leave own tip deselected. */
ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
}
}
diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c
index cdc8cd1068c..6ae93def50f 100644
--- a/source/blender/imbuf/intern/rectop.c
+++ b/source/blender/imbuf/intern/rectop.c
@@ -1275,9 +1275,9 @@ void buf_rectfill_area(unsigned char *rect,
/**
* Blend pixels of image area with solid color.
*
- * For images with `uchar` buffer use color matching image colorspace.
- * For images with float buffer use color display colorspace.
- * If display colorspace can not be referenced, use color in SRGB colorspace.
+ * For images with `uchar` buffer use color matching image color-space.
+ * For images with float buffer use color display color-space.
+ * If display color-space can not be referenced, use color in SRGB color-space.
*
* \param ibuf: an image to be filled with color. It must be 4 channel image.
* \param col: RGBA color.
@@ -1285,7 +1285,7 @@ void buf_rectfill_area(unsigned char *rect,
* (x2, y2) is the end point. Note that values are allowed to be loosely ordered, which means that
* x2 is allowed to be lower than x1, as well as y2 is allowed to be lower than y1. No matter the
* order the area between x1 and x2, and y1 and y2 is filled.
- * \param display: colorspace reference for display space.
+ * \param display: color-space reference for display space.
*/
void IMB_rectfill_area(ImBuf *ibuf,
const float col[4],
diff --git a/source/blender/render/intern/texture_image.c b/source/blender/render/intern/texture_image.c
index cd34226920d..f0663b07a3c 100644
--- a/source/blender/render/intern/texture_image.c
+++ b/source/blender/render/intern/texture_image.c
@@ -742,8 +742,10 @@ typedef struct afdata_t {
/* this only used here to make it easier to pass extend flags as single int */
enum { TXC_XMIR = 1, TXC_YMIR, TXC_REPT, TXC_EXTD };
-/* similar to ibuf_get_color() but clips/wraps coords according to repeat/extend flags
- * returns true if out of range in clipmode */
+/**
+ * Similar to `ibuf_get_color()` but clips/wraps coords according to repeat/extend flags
+ * returns true if out of range in clip-mode.
+ */
static int ibuf_get_color_clip(float col[4], ImBuf *ibuf, int x, int y, int extflag)
{
int clip = 0;
@@ -1114,7 +1116,7 @@ static int imagewraposa_aniso(Tex *tex,
float t;
SWAP(float, minx, miny);
/* must rotate dxt/dyt 90 deg
- * yet another blender problem is that swapping X/Y axes (or any tex proj switches)
+ * yet another blender problem is that swapping X/Y axes (or any tex projection switches)
* should do something similar, but it doesn't, it only swaps coords,
* so filter area will be incorrect in those cases. */
t = dxt[0];
@@ -1257,9 +1259,9 @@ static int imagewraposa_aniso(Tex *tex,
int maxlev;
ImBuf *mipmaps[IMB_MIPMAP_LEVELS + 1];
- /* modify ellipse minor axis if too eccentric, use for area sampling as well
- * scaling dxt/dyt as done in pbrt is not the same
- * (as in ewa_eval(), scale by sqrt(ibuf->x) to maximize precision) */
+ /* Modify ellipse minor axis if too eccentric, use for area sampling as well
+ * scaling `dxt/dyt` as done in PBRT is not the same
+ * (as in `ewa_eval()`, scale by `sqrt(ibuf->x)` to maximize precision). */
const float ff = sqrtf(ibuf->x), q = ibuf->y / ff;
const float Ux = dxt[0] * ff, Vx = dxt[1] * q, Uy = dyt[0] * ff, Vy = dyt[1] * q;
const float A = Vx * Vx + Vy * Vy;
diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c
index f6d80602f4c..ecfd230be18 100644
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@ -80,7 +80,7 @@ static ThreadMutex seq_render_mutex = BLI_MUTEX_INITIALIZER;
SequencerDrawView sequencer_view3d_fn = NULL; /* NULL in background mode */
/* -------------------------------------------------------------------- */
-/** \name Colorspace utility functions
+/** \name Color-space utility functions
* \{ */
void seq_imbuf_assign_spaces(Scene *scene, ImBuf *ibuf)
{
@@ -1778,9 +1778,8 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context,
state->scene_parents = &scene_parent;
/* end check */
- /* Use the Scene Seq's scene for the context when rendering the scene's sequences
- * (necessary for Multicam Selector among others).
- */
+ /* Use the Scene sequence-strip's scene for the context when rendering the
+ * scene's sequences (necessary for multi-cam selector among others). */
SeqRenderData local_context = *context;
local_context.scene = seq->scene;
local_context.skip_cache = true;
@@ -2040,11 +2039,11 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context,
return out;
}
-/*
- * returned ImBuf is refed!
- * you have to free after usage!
+/**
+ * \return The image buffer or NULL.
+ *
+ * \note The returned #ImBuf is has it's reference increased, free after usage!
*/
-
ImBuf *SEQ_render_give_ibuf(const SeqRenderData *context, float timeline_frame, int chanshown)
{
Scene *scene = context->scene;
More information about the Bf-blender-cvs
mailing list