Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-03-09 17:02:04 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-03-09 17:07:38 +0300
commitbeaf2baeffc9a15eba53a61460573948319fecf4 (patch)
tree1b08d4b58783f279d79da4c91d0b6f789052299e
parentef3d76fbaa37110fd857f3aabff815600e43915a (diff)
Cleanup: fix wrong spelling of texture and indentation
Contributed by luzpaz. Ref D14271, D14270
-rw-r--r--source/blender/blenkernel/intern/fluid.c2
-rw-r--r--source/blender/blenkernel/intern/linestyle.c18
-rw-r--r--source/blender/editors/animation/anim_channels_defines.c150
-rw-r--r--source/blender/editors/animation/anim_channels_edit.c4
-rw-r--r--source/blender/editors/include/ED_anim_api.h2
-rw-r--r--source/blender/python/gpu/gpu_py_texture.c4
6 files changed, 90 insertions, 90 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index f85361e94ff..ca9d758c692 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -1937,7 +1937,7 @@ static void sample_mesh(FluidFlowSettings *ffs,
interp_v2_v2v2v2(tex_co, UNPACK3(uv), weights);
- /* Map texure coord between -1.0f and 1.0f. */
+ /* Map texture coord between -1.0f and 1.0f. */
tex_co[0] = tex_co[0] * 2.0f - 1.0f;
tex_co[1] = tex_co[1] * 2.0f - 1.0f;
tex_co[2] = ffs->texture_offset;
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index e50d6263423..bbcc886f3ff 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -2035,7 +2035,7 @@ bool BKE_linestyle_use_textures(FreestyleLineStyle *linestyle, const bool use_sh
void BKE_linestyle_default_shader(const bContext *C, FreestyleLineStyle *linestyle)
{
- bNode *uv_along_stroke, *input_texure, *output_linestyle;
+ bNode *uv_along_stroke, *input_texture, *output_linestyle;
bNodeSocket *fromsock, *tosock;
bNodeTree *ntree;
@@ -2050,9 +2050,9 @@ void BKE_linestyle_default_shader(const bContext *C, FreestyleLineStyle *linesty
uv_along_stroke->locy = 300.0f;
uv_along_stroke->custom1 = 0; /* use_tips */
- input_texure = nodeAddStaticNode(C, ntree, SH_NODE_TEX_IMAGE);
- input_texure->locx = 200.0f;
- input_texure->locy = 300.0f;
+ input_texture = nodeAddStaticNode(C, ntree, SH_NODE_TEX_IMAGE);
+ input_texture->locx = 200.0f;
+ input_texture->locy = 300.0f;
output_linestyle = nodeAddStaticNode(C, ntree, SH_NODE_OUTPUT_LINESTYLE);
output_linestyle->locx = 400.0f;
@@ -2060,15 +2060,15 @@ void BKE_linestyle_default_shader(const bContext *C, FreestyleLineStyle *linesty
output_linestyle->custom1 = MA_RAMP_BLEND;
output_linestyle->custom2 = 0; /* use_clamp */
- nodeSetActive(ntree, input_texure);
+ nodeSetActive(ntree, input_texture);
fromsock = BLI_findlink(&uv_along_stroke->outputs, 0); /* UV */
- tosock = BLI_findlink(&input_texure->inputs, 0); /* UV */
- nodeAddLink(ntree, uv_along_stroke, fromsock, input_texure, tosock);
+ tosock = BLI_findlink(&input_texture->inputs, 0); /* UV */
+ nodeAddLink(ntree, uv_along_stroke, fromsock, input_texture, tosock);
- fromsock = BLI_findlink(&input_texure->outputs, 0); /* Color */
+ fromsock = BLI_findlink(&input_texture->outputs, 0); /* Color */
tosock = BLI_findlink(&output_linestyle->inputs, 0); /* Color */
- nodeAddLink(ntree, input_texure, fromsock, output_linestyle, tosock);
+ nodeAddLink(ntree, input_texture, fromsock, output_linestyle, tosock);
BKE_ntree_update_main_tree(CTX_data_main(C), ntree, NULL);
}
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index edb6d188ab8..f4412ea837d 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -203,7 +203,7 @@ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, floa
rgb_uchar_to_float(r_color, cp);
}
else {
- /* FIXME: what happens when the indention is 1 greater than what it should be
+ /* FIXME: what happens when the indentation is 1 greater than what it should be
* (due to grouping)? */
int colOfs = 10 - 10 * indent;
UI_GetThemeColorShade3fv(TH_SHADE2, colOfs, r_color);
@@ -252,44 +252,44 @@ static void acf_generic_channel_backdrop(bAnimContext *ac,
immUnbindProgram();
}
-/* Indention + Offset ------------------------------------------- */
+/* Indentation + Offset ------------------------------------------- */
-/* indention level is always the value in the name */
-static short acf_generic_indention_0(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale))
+/* indentation level is always the value in the name */
+static short acf_generic_indentation_0(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale))
{
return 0;
}
-static short acf_generic_indention_1(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale))
+static short acf_generic_indentation_1(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale))
{
return 1;
}
#if 0 /* XXX not used */
-static short acf_generic_indention_2(bAnimContext *ac, bAnimListElem *ale)
+static short acf_generic_indentation_2(bAnimContext *ac, bAnimListElem *ale)
{
return 2;
}
#endif
-/* indention which varies with the grouping status */
-static short acf_generic_indention_flexible(bAnimContext *UNUSED(ac), bAnimListElem *ale)
+/* indentation which varies with the grouping status */
+static short acf_generic_indentation_flexible(bAnimContext *UNUSED(ac), bAnimListElem *ale)
{
short indent = 0;
- /* grouped F-Curves need extra level of indention */
+ /* grouped F-Curves need extra level of indentation */
if (ale->type == ANIMTYPE_FCURVE) {
FCurve *fcu = (FCurve *)ale->data;
- /* TODO: we need some way of specifying that the indention color should be one less. */
+ /* TODO: we need some way of specifying that the indentation color should be one less. */
if (fcu->grp) {
indent++;
}
}
- /* no indention */
+ /* no indentation */
return indent;
}
-/* basic offset for channels derived from indention */
+/* basic offset for channels derived from indentation */
static short acf_generic_basic_offset(bAnimContext *ac, bAnimListElem *ale)
{
const bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
@@ -352,7 +352,7 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale)
}
}
- /* offset is just the normal type - i.e. based on indention */
+ /* offset is just the normal type - i.e. based on indentation */
return offset;
}
@@ -530,10 +530,10 @@ static bAnimChannelType ACF_SUMMARY = {
"Summary", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
- acf_summary_color, /* backdrop color */
- acf_summary_backdrop, /* backdrop */
- acf_generic_indention_0, /* indent level */
- NULL, /* offset */
+ acf_summary_color, /* backdrop color */
+ acf_summary_backdrop, /* backdrop */
+ acf_generic_indentation_0, /* indent level */
+ NULL, /* offset */
acf_summary_name, /* name */
NULL, /* name prop */
@@ -641,7 +641,7 @@ static bAnimChannelType ACF_SCENE = {
acf_generic_root_color, /* backdrop color */
acf_generic_root_backdrop, /* backdrop */
- acf_generic_indention_0, /* indent level */
+ acf_generic_indentation_0, /* indent level */
NULL, /* offset */
acf_generic_idblock_name, /* name */
@@ -817,7 +817,7 @@ static bAnimChannelType ACF_OBJECT = {
acf_generic_root_color, /* backdrop color */
acf_generic_root_backdrop, /* backdrop */
- acf_generic_indention_0, /* indent level */
+ acf_generic_indentation_0, /* indent level */
NULL, /* offset */
acf_object_name, /* name */
@@ -992,10 +992,10 @@ static bAnimChannelType ACF_GROUP = {
"Group", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
- acf_group_color, /* backdrop color */
- acf_group_backdrop, /* backdrop */
- acf_generic_indention_0, /* indent level */
- acf_generic_group_offset, /* offset */
+ acf_group_color, /* backdrop color */
+ acf_group_backdrop, /* backdrop */
+ acf_generic_indentation_0, /* indent level */
+ acf_generic_group_offset, /* offset */
acf_group_name, /* name */
acf_group_name_prop, /* name prop */
@@ -1118,7 +1118,7 @@ static bAnimChannelType ACF_FCURVE = {
acf_generic_channel_color, /* backdrop color */
acf_generic_channel_backdrop, /* backdrop */
- acf_generic_indention_flexible,
+ acf_generic_indentation_flexible,
/* indent level */ /* XXX rename this to f-curves only? */
acf_generic_group_offset, /* offset */
@@ -1238,7 +1238,7 @@ static bAnimChannelType ACF_NLACONTROLS = {
acf_nla_controls_color, /* backdrop color */
acf_nla_controls_backdrop, /* backdrop */
- acf_generic_indention_0, /* indent level */
+ acf_generic_indentation_0, /* indent level */
acf_generic_group_offset, /* offset */
acf_nla_controls_name, /* name */
@@ -1278,7 +1278,7 @@ static bAnimChannelType ACF_NLACURVE = {
acf_generic_channel_color, /* backdrop color */
acf_generic_channel_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_group_offset, /* offset */
acf_nla_curve_name, /* name */
@@ -1368,7 +1368,7 @@ static bAnimChannelType ACF_FILLACTD = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -1453,7 +1453,7 @@ static bAnimChannelType ACF_FILLDRIVERS = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_filldrivers_name, /* name */
@@ -1532,7 +1532,7 @@ static bAnimChannelType ACF_DSMAT = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -1613,7 +1613,7 @@ static bAnimChannelType ACF_DSLIGHT = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -1637,7 +1637,7 @@ static int acf_dstex_icon(bAnimListElem *UNUSED(ale))
/* FIXME: soon to be obsolete? */
static short acf_dstex_offset(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale))
{
- return 14; /* XXX: simply include this in indention instead? */
+ return 14; /* XXX: simply include this in indentation instead? */
}
/* Get the appropriate flag(s) for the setting when it is valid. */
@@ -1699,7 +1699,7 @@ static bAnimChannelType ACF_DSTEX = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_dstex_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -1782,7 +1782,7 @@ static bAnimChannelType ACF_DSCACHEFILE = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -1865,7 +1865,7 @@ static bAnimChannelType ACF_DSCAM = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -1954,7 +1954,7 @@ static bAnimChannelType ACF_DSCUR = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2052,7 +2052,7 @@ static bAnimChannelType ACF_DSSKEY = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2131,7 +2131,7 @@ static bAnimChannelType ACF_DSWOR = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2210,7 +2210,7 @@ static bAnimChannelType ACF_DSPART = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2291,7 +2291,7 @@ static bAnimChannelType ACF_DSMBALL = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2370,7 +2370,7 @@ static bAnimChannelType ACF_DSARM = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2462,7 +2462,7 @@ static bAnimChannelType ACF_DSNTREE = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_dsntree_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2543,7 +2543,7 @@ static bAnimChannelType ACF_DSLINESTYLE = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2622,7 +2622,7 @@ static bAnimChannelType ACF_DSMESH = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1,
+ acf_generic_indentation_1,
/* indent level */ /* XXX this only works for compositing */
acf_generic_basic_offset, /* offset */
@@ -2702,7 +2702,7 @@ static bAnimChannelType ACF_DSLAT = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1,
+ acf_generic_indentation_1,
/* indent level */ /* XXX this only works for compositing */
acf_generic_basic_offset, /* offset */
@@ -2782,7 +2782,7 @@ static bAnimChannelType ACF_DSSPK = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2863,7 +2863,7 @@ static bAnimChannelType ACF_DSHAIR = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -2944,7 +2944,7 @@ static bAnimChannelType ACF_DSPOINTCLOUD = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -3025,7 +3025,7 @@ static bAnimChannelType ACF_DSVOLUME = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -3103,7 +3103,7 @@ static bAnimChannelType ACF_DSSIMULATION = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -3184,7 +3184,7 @@ static bAnimChannelType ACF_DSGPENCIL = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -3265,7 +3265,7 @@ static bAnimChannelType ACF_DSMCLIP = {
acf_generic_dataexpand_color, /* backdrop color */
acf_generic_dataexpand_backdrop, /* backdrop */
- acf_generic_indention_1, /* indent level */
+ acf_generic_indentation_1, /* indent level */
acf_generic_basic_offset, /* offset */
acf_generic_idblock_name, /* name */
@@ -3380,7 +3380,7 @@ static bAnimChannelType ACF_SHAPEKEY = {
acf_generic_channel_color, /* backdrop color */
acf_generic_channel_backdrop, /* backdrop */
- acf_generic_indention_0, /* indent level */
+ acf_generic_indentation_0, /* indent level */
acf_generic_basic_offset, /* offset */
acf_shapekey_name, /* name */
@@ -3458,10 +3458,10 @@ static bAnimChannelType ACF_GPD = {
"GPencil Datablock", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
- acf_gpd_color, /* backdrop color */
- acf_group_backdrop, /* backdrop */
- acf_generic_indention_0, /* indent level */
- acf_generic_group_offset, /* offset */
+ acf_gpd_color, /* backdrop color */
+ acf_group_backdrop, /* backdrop */
+ acf_generic_indentation_0, /* indent level */
+ acf_generic_group_offset, /* offset */
acf_generic_idblock_name, /* name */
acf_generic_idfill_name_prop, /* name prop */
@@ -3557,10 +3557,10 @@ static bAnimChannelType ACF_GPL = {
"GPencil Layer", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
- acf_gpencil_channel_color, /* backdrop color */
- acf_generic_channel_backdrop, /* backdrop */
- acf_generic_indention_flexible, /* indent level */
- acf_generic_group_offset, /* offset */
+ acf_gpencil_channel_color, /* backdrop color */
+ acf_generic_channel_backdrop, /* backdrop */
+ acf_generic_indentation_flexible, /* indent level */
+ acf_generic_group_offset, /* offset */
acf_gpl_name, /* name */
acf_gpl_name_prop, /* name prop */
@@ -3639,10 +3639,10 @@ static bAnimChannelType ACF_MASKDATA = {
"Mask Datablock", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
- acf_mask_color, /* backdrop color */
- acf_group_backdrop, /* backdrop */
- acf_generic_indention_0, /* indent level */
- acf_generic_group_offset, /* offset */
+ acf_mask_color, /* backdrop color */
+ acf_group_backdrop, /* backdrop */
+ acf_generic_indentation_0, /* indent level */
+ acf_generic_group_offset, /* offset */
acf_generic_idblock_name, /* name */
acf_generic_idfill_name_prop, /* name prop */
@@ -3735,10 +3735,10 @@ static bAnimChannelType ACF_MASKLAYER = {
"Mask Layer", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
- acf_generic_channel_color, /* backdrop color */
- acf_generic_channel_backdrop, /* backdrop */
- acf_generic_indention_flexible, /* indent level */
- acf_generic_group_offset, /* offset */
+ acf_generic_channel_color, /* backdrop color */
+ acf_generic_channel_backdrop, /* backdrop */
+ acf_generic_indentation_flexible, /* indent level */
+ acf_generic_group_offset, /* offset */
acf_masklay_name, /* name */
acf_masklay_name_prop, /* name prop */
@@ -3875,9 +3875,9 @@ static bAnimChannelType ACF_NLATRACK = {
"NLA Track", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
- acf_nlatrack_color, /* backdrop color */
- acf_generic_channel_backdrop, /* backdrop */
- acf_generic_indention_flexible, /* indent level */
+ acf_nlatrack_color, /* backdrop color */
+ acf_generic_channel_backdrop, /* backdrop */
+ acf_generic_indentation_flexible, /* indent level */
acf_generic_group_offset,
/* offset */ /* XXX? */
@@ -4056,10 +4056,10 @@ static bAnimChannelType ACF_NLAACTION = {
"NLA Active Action", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
- acf_nlaaction_color, /* backdrop color (NOTE: the backdrop handles this too,
- * since it needs special hacks). */
- acf_nlaaction_backdrop, /* backdrop */
- acf_generic_indention_flexible, /* indent level */
+ acf_nlaaction_color, /* backdrop color (NOTE: the backdrop handles this too,
+ * since it needs special hacks). */
+ acf_nlaaction_backdrop, /* backdrop */
+ acf_generic_indentation_flexible, /* indent level */
acf_generic_group_offset,
/* offset */ /* XXX? */
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 3a57287cd60..df418b204f9 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -490,7 +490,7 @@ static void anim_flush_channel_setting_up(bAnimContext *ac,
}
/* Go backwards in the list, until the highest-ranking element
- * (by indention has been covered). */
+ * (by indentation has been covered). */
int prevLevel = matchLevel;
for (bAnimListElem *ale = match->prev; ale; ale = ale->prev) {
const bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
@@ -539,7 +539,7 @@ static void anim_flush_channel_setting_down(bAnimContext *ac,
bAnimListElem *const match,
const int matchLevel)
{
- /* go forwards in the list, until the lowest-ranking element (by indention has been covered) */
+ /* go forwards in the list, until the lowest-ranking element (by indentation has been covered) */
for (bAnimListElem *ale = match->next; ale; ale = ale->next) {
const bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index 3402d45fa96..4cae8bdab18 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -577,7 +577,7 @@ typedef struct bAnimChannelType {
void (*get_backdrop_color)(bAnimContext *ac, bAnimListElem *ale, float r_color[3]);
/** Draw backdrop strip for channel. */
void (*draw_backdrop)(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc);
- /** Get depth of indention (relative to the depth channel is nested at). */
+ /** Get depth of indentation (relative to the depth channel is nested at). */
short (*get_indent_level)(bAnimContext *ac, bAnimListElem *ale);
/** Get offset in pixels for the start of the channel (in addition to the indent depth). */
short (*get_offset)(bAnimContext *ac, bAnimListElem *ale);
diff --git a/source/blender/python/gpu/gpu_py_texture.c b/source/blender/python/gpu/gpu_py_texture.c
index ab038423878..0ad55aeac78 100644
--- a/source/blender/python/gpu/gpu_py_texture.c
+++ b/source/blender/python/gpu/gpu_py_texture.c
@@ -545,11 +545,11 @@ static struct PyMethodDef pygpu_texture__m_methods[] = {
{NULL, NULL, 0, NULL},
};
-PyDoc_STRVAR(pygpu_texure__m_doc, "This module provides utils for textures.");
+PyDoc_STRVAR(pygpu_texture__m_doc, "This module provides utils for textures.");
static PyModuleDef pygpu_texture_module_def = {
PyModuleDef_HEAD_INIT,
.m_name = "gpu.texture",
- .m_doc = pygpu_texure__m_doc,
+ .m_doc = pygpu_texture__m_doc,
.m_methods = pygpu_texture__m_methods,
};