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
path: root/source/blender/editors
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/animation/anim_channels_defines.c73
-rw-r--r--source/blender/editors/animation/keyframing.c7
-rw-r--r--source/blender/editors/include/ED_screen_types.h6
-rw-r--r--source/blender/editors/include/ED_view3d.h6
-rw-r--r--source/blender/editors/mask/mask_edit.c2
-rw-r--r--source/blender/editors/mask/mask_editaction.c4
-rw-r--r--source/blender/editors/mesh/meshtools.c38
-rw-r--r--source/blender/editors/space_node/node_draw.cc2
8 files changed, 70 insertions, 68 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index f4412ea837d..445d3715658 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -525,7 +525,7 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale,
return NULL;
}
-/* all animation summary (DopeSheet only) type define */
+/** All animation summary (dope-sheet only) type define. */
static bAnimChannelType ACF_SUMMARY = {
"Summary", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -634,7 +634,7 @@ static void *acf_scene_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* scene type define */
+/** Scene type define. */
static bAnimChannelType ACF_SCENE = {
"Scene", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -810,7 +810,7 @@ static void *acf_object_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se
}
}
-/* object type define */
+/** Object type define. */
static bAnimChannelType ACF_OBJECT = {
"Object", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -987,7 +987,7 @@ static void *acf_group_setting_ptr(bAnimListElem *ale,
return GET_ACF_FLAG_PTR(agrp->flag, type);
}
-/* group type define */
+/** Group type define. */
static bAnimChannelType ACF_GROUP = {
"Group", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
@@ -1111,7 +1111,7 @@ static void *acf_fcurve_setting_ptr(bAnimListElem *ale,
return GET_ACF_FLAG_PTR(fcu->flag, type);
}
-/* fcurve type define */
+/** F-Curve type define. */
static bAnimChannelType ACF_FCURVE = {
"F-Curve", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
@@ -1231,7 +1231,7 @@ static int acf_nla_controls_icon(bAnimListElem *UNUSED(ale))
return ICON_NLA;
}
-/* NLA Control FCurves Expander type define */
+/** NLA Control F-Curves expander type define. */
static bAnimChannelType ACF_NLACONTROLS = {
"NLA Controls Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -1271,7 +1271,7 @@ static void acf_nla_curve_name(bAnimListElem *ale, char *name)
}
}
-/* NLA Control F-Curve type define */
+/** NLA Control F-Curve type define. */
static bAnimChannelType ACF_NLACURVE = {
"NLA Control F-Curve", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
@@ -1361,7 +1361,7 @@ static void *acf_fillactd_setting_ptr(bAnimListElem *ale,
}
}
-/* object action expander type define */
+/** Object action expander type define. */
static bAnimChannelType ACF_FILLACTD = {
"Ob-Action Filler", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -1446,7 +1446,7 @@ static void *acf_filldrivers_setting_ptr(bAnimListElem *ale,
}
}
-/* drivers expander type define */
+/** Drivers expander type define. */
static bAnimChannelType ACF_FILLDRIVERS = {
"Drivers Filler", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -1525,7 +1525,7 @@ static void *acf_dsmat_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* material expander type define */
+/** Material expander type define. */
static bAnimChannelType ACF_DSMAT = {
"Material Data Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -1606,7 +1606,7 @@ static void *acf_dslight_setting_ptr(bAnimListElem *ale,
}
}
-/* light expander type define */
+/** Light expander type define. */
static bAnimChannelType ACF_DSLIGHT = {
"Light Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -1692,7 +1692,7 @@ static void *acf_dstex_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* texture expander type define */
+/** Texture expander type define. */
static bAnimChannelType ACF_DSTEX = {
"Texture Data Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -1775,7 +1775,7 @@ static void *acf_dscachefile_setting_ptr(bAnimListElem *ale,
}
}
-/* CacheFile expander type define. */
+/** CacheFile expander type define.. */
static bAnimChannelType ACF_DSCACHEFILE = {
"Cache File Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -1858,7 +1858,7 @@ static void *acf_dscam_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* camera expander type define */
+/** Camera expander type define. */
static bAnimChannelType ACF_DSCAM = {
"Camera Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -1947,7 +1947,7 @@ static void *acf_dscur_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* curve expander type define */
+/** Curve expander type define. */
static bAnimChannelType ACF_DSCUR = {
"Curve Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2045,7 +2045,7 @@ static void *acf_dsskey_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se
}
}
-/* shapekey expander type define */
+/** Shape-key expander type define. */
static bAnimChannelType ACF_DSSKEY = {
"Shape Key Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2124,7 +2124,7 @@ static void *acf_dswor_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* world expander type define */
+/** World expander type define. */
static bAnimChannelType ACF_DSWOR = {
"World Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2203,7 +2203,7 @@ static void *acf_dspart_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se
}
}
-/* particle expander type define */
+/** Particle expander type define. */
static bAnimChannelType ACF_DSPART = {
"Particle Data Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2284,7 +2284,7 @@ static void *acf_dsmball_setting_ptr(bAnimListElem *ale,
}
}
-/* metaball expander type define */
+/** Meta-ball expander type define. */
static bAnimChannelType ACF_DSMBALL = {
"Metaball Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2363,7 +2363,7 @@ static void *acf_dsarm_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* metaball expander type define */
+/** Armature expander type define. */
static bAnimChannelType ACF_DSARM = {
"Armature Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2455,7 +2455,7 @@ static void *acf_dsntree_setting_ptr(bAnimListElem *ale,
}
}
-/* node tree expander type define */
+/** Node tree expander type define. */
static bAnimChannelType ACF_DSNTREE = {
"Node Tree Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2536,7 +2536,7 @@ static void *acf_dslinestyle_setting_ptr(bAnimListElem *ale,
}
}
-/* node tree expander type define */
+/** Line Style expander type define. */
static bAnimChannelType ACF_DSLINESTYLE = {
"Line Style Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2615,7 +2615,7 @@ static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings se
}
}
-/* node tree expander type define */
+/** Mesh expander type define. */
static bAnimChannelType ACF_DSMESH = {
"Mesh Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2695,7 +2695,7 @@ static void *acf_dslat_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* node tree expander type define */
+/** Lattice expander type define. */
static bAnimChannelType ACF_DSLAT = {
"Lattice Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2775,7 +2775,7 @@ static void *acf_dsspk_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings set
}
}
-/* speaker expander type define */
+/** Speaker expander type define. */
static bAnimChannelType ACF_DSSPK = {
"Speaker Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2856,7 +2856,7 @@ static void *acf_dscurves_setting_ptr(bAnimListElem *ale,
}
}
-/* Curves expander type define */
+/** Curves expander type define. */
static bAnimChannelType ACF_DSHAIR = {
"Curves Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -2937,7 +2937,7 @@ static void *acf_dspointcloud_setting_ptr(bAnimListElem *ale,
}
}
-/* pointcloud expander type define */
+/** Point-cloud expander type define. */
static bAnimChannelType ACF_DSPOINTCLOUD = {
"PointCloud Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -3018,7 +3018,7 @@ static void *acf_dsvolume_setting_ptr(bAnimListElem *ale,
}
}
-/* volume expander type define */
+/** Volume expander type define. */
static bAnimChannelType ACF_DSVOLUME = {
"Volume Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -3097,6 +3097,7 @@ static void *acf_dssimulation_setting_ptr(bAnimListElem *ale,
}
}
+/** Simulation expander type define. */
static bAnimChannelType ACF_DSSIMULATION = {
"Simulation Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -3177,7 +3178,7 @@ static void *acf_dsgpencil_setting_ptr(bAnimListElem *ale,
}
}
-/* grease pencil expander type define */
+/** Grease-pencil expander type define. */
static bAnimChannelType ACF_DSGPENCIL = {
"GPencil DS Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -3258,7 +3259,7 @@ static void *acf_dsmclip_setting_ptr(bAnimListElem *ale,
}
}
-/* world expander type define */
+/** Movie-clip expander type define. */
static bAnimChannelType ACF_DSMCLIP = {
"Movieclip Expander", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -3373,7 +3374,7 @@ static void *acf_shapekey_setting_ptr(bAnimListElem *ale,
}
}
-/* shapekey expander type define */
+/** Shape-key expander type define. */
static bAnimChannelType ACF_SHAPEKEY = {
"Shape Key", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
@@ -3453,7 +3454,7 @@ static void *acf_gpd_setting_ptr(bAnimListElem *ale,
return GET_ACF_FLAG_PTR(gpd->flag, type);
}
-/* gpencil datablock type define */
+/** Grease-pencil data-block type define. */
static bAnimChannelType ACF_GPD = {
"GPencil Datablock", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -3552,7 +3553,7 @@ static void *acf_gpl_setting_ptr(bAnimListElem *ale,
return GET_ACF_FLAG_PTR(gpl->flag, type);
}
-/* grease pencil layer type define */
+/** Grease-pencil layer type define. */
static bAnimChannelType ACF_GPL = {
"GPencil Layer", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
@@ -3634,7 +3635,7 @@ static void *acf_mask_setting_ptr(bAnimListElem *ale,
return GET_ACF_FLAG_PTR(mask->flag, type);
}
-/* mask datablock type define */
+/** Mask data-block type define. */
static bAnimChannelType ACF_MASKDATA = {
"Mask Datablock", /* type name */
ACHANNEL_ROLE_EXPANDER, /* role */
@@ -3730,7 +3731,7 @@ static void *acf_masklay_setting_ptr(bAnimListElem *ale,
return GET_ACF_FLAG_PTR(masklay->flag, type);
}
-/* grease pencil layer type define */
+/** Mask layer type define. */
static bAnimChannelType ACF_MASKLAYER = {
"Mask Layer", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
@@ -3870,7 +3871,7 @@ static void *acf_nlatrack_setting_ptr(bAnimListElem *ale,
return GET_ACF_FLAG_PTR(nlt->flag, type);
}
-/* nla track type define */
+/** NLA track type define. */
static bAnimChannelType ACF_NLATRACK = {
"NLA Track", /* type name */
ACHANNEL_ROLE_CHANNEL, /* role */
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 90c127b620b..0f93d728c8c 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -2848,13 +2848,12 @@ static bool object_frame_has_keyframe(Object *ob, float frame, short filter)
}
}
- /* try shapekey keyframes (if available, and allowed by filter) */
+ /* Try shape-key keyframes (if available, and allowed by filter). */
if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOSKEY)) {
Key *key = BKE_key_from_object(ob);
- /* shapekeys can have keyframes ('Relative Shape Keys')
- * or depend on time (old 'Absolute Shape Keys')
- */
+ /* Shape-keys can have keyframes ('Relative Shape Keys')
+ * or depend on time (old 'Absolute Shape Keys'). */
/* 1. test for relative (with keyframes) */
if (id_frame_has_keyframe((ID *)key, frame, filter)) {
diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h
index 86fb5251ff3..21bb412d072 100644
--- a/source/blender/editors/include/ED_screen_types.h
+++ b/source/blender/editors/include/ED_screen_types.h
@@ -13,7 +13,9 @@ extern "C" {
/* ----------------------------------------------------- */
-/* for animplayer */
+/**
+ * For animation playback operator, stored in #bScreen.animtimer.customdata.
+ */
typedef struct ScreenAnimData {
ARegion *region; /* do not read from this, only for comparing if region exists */
short redraws;
@@ -24,7 +26,7 @@ typedef struct ScreenAnimData {
bool from_anim_edit; /* playback was invoked from animation editor */
} ScreenAnimData;
-/* for animplayer */
+/** #ScreenAnimData.flag */
enum {
/* user-setting - frame range is played backwards */
ANIMPLAY_FLAG_REVERSE = (1 << 0),
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index b1435e76eb2..d2ff5637a13 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -646,7 +646,7 @@ bool ED_view3d_win_to_3d_on_plane_int(const struct ARegion *region,
*
* \param region: The region (used for the window width and height).
* \param xy_delta: 2D difference (in pixels) such as `event->mval[0] - other_x`.
- * \param zfac: The depth result typically calculated by by #ED_view3d_calc_zfac
+ * \param zfac: The depth result typically calculated by #ED_view3d_calc_zfac
* (see it's doc-string for details).
* \param r_out: The resulting world-space delta.
*/
@@ -661,7 +661,7 @@ void ED_view3d_win_to_delta(const struct ARegion *region,
* the origin in this case is close to zero coordinate.
*
* \param region: The region (used for the window width and height).
- * \param mval: The area relative 2d location (such as event->mval converted to floats).
+ * \param mval: The area relative 2d location (such as `event->mval` converted to float).
* \param r_out: The resulting normalized world-space direction vector.
*/
void ED_view3d_win_to_origin(const struct ARegion *region, const float mval[2], float r_out[3]);
@@ -675,7 +675,7 @@ void ED_view3d_win_to_origin(const struct ARegion *region, const float mval[2],
* the mouse cursor as a normalized vector.
*
* \param region: The region (used for the window width and height).
- * \param mval: The area relative 2d location (such as event->mval converted to floats).
+ * \param mval: The area relative 2d location (such as `event->mval` converted to float).
* \param r_out: The resulting normalized world-space direction vector.
*/
void ED_view3d_win_to_vector(const struct ARegion *region, const float mval[2], float r_out[3]);
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c
index 819ffd96b1c..b2d49bcc642 100644
--- a/source/blender/editors/mask/mask_edit.c
+++ b/source/blender/editors/mask/mask_edit.c
@@ -111,7 +111,7 @@ void ED_operatortypes_mask(void)
WM_operatortype_append(MASK_OT_parent_set);
WM_operatortype_append(MASK_OT_parent_clear);
- /* shapekeys */
+ /* Shape-keys. */
WM_operatortype_append(MASK_OT_shape_key_insert);
WM_operatortype_append(MASK_OT_shape_key_clear);
WM_operatortype_append(MASK_OT_shape_key_feather_reset);
diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c
index 8bb6e8a71db..8a23a53a5d2 100644
--- a/source/blender/editors/mask/mask_editaction.c
+++ b/source/blender/editors/mask/mask_editaction.c
@@ -30,8 +30,8 @@
/* ***************************************** */
/* NOTE ABOUT THIS FILE:
* This file contains code for editing Mask data in the Action Editor
- * as a 'keyframes', so that a user can adjust the timing of Mask shapekeys.
- * Therefore, this file mostly contains functions for selecting Mask frames (shapekeys).
+ * as a 'keyframes', so that a user can adjust the timing of Mask shape-keys.
+ * Therefore, this file mostly contains functions for selecting Mask frames (shape-keys).
*/
/* ***************************************** */
/* Generics - Loopers */
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index f3782c17845..d57471b658c 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -137,22 +137,22 @@ static void join_mesh_single(Depsgraph *depsgraph,
mul_m4_v3(cmat, mvert->co);
}
- /* For each shapekey in destination mesh:
+ /* For each shape-key in destination mesh:
* - if there's a matching one, copy it across
* (will need to transform vertices into new space...).
* - otherwise, just copy own coordinates of mesh
* (no need to transform vertex coordinates into new space).
*/
if (key) {
- /* if this mesh has any shapekeys, check first, otherwise just copy coordinates */
+ /* if this mesh has any shape-keys, check first, otherwise just copy coordinates */
LISTBASE_FOREACH (KeyBlock *, kb, &key->block) {
- /* get pointer to where to write data for this mesh in shapekey's data array */
+ /* get pointer to where to write data for this mesh in shape-key's data array */
float(*cos)[3] = ((float(*)[3])kb->data) + *vertofs;
- /* check if this mesh has such a shapekey */
+ /* Check if this mesh has such a shape-key. */
KeyBlock *okb = me->key ? BKE_keyblock_find_name(me->key, kb->name) : NULL;
if (okb) {
- /* copy this mesh's shapekey to the destination shapekey
+ /* copy this mesh's shape-key to the destination shape-key
* (need to transform first) */
float(*ocos)[3] = okb->data;
for (a = 0; a < me->totvert; a++, cos++, ocos++) {
@@ -161,7 +161,7 @@ static void join_mesh_single(Depsgraph *depsgraph,
}
}
else {
- /* copy this mesh's vertex coordinates to the destination shapekey */
+ /* Copy this mesh's vertex coordinates to the destination shape-key. */
for (a = 0, mvert = *mvert_pp; a < me->totvert; a++, cos++, mvert++) {
copy_v3_v3(*cos, mvert->co);
}
@@ -170,26 +170,26 @@ static void join_mesh_single(Depsgraph *depsgraph,
}
}
else {
- /* for each shapekey in destination mesh:
+ /* for each shape-key in destination mesh:
* - if it was an 'original', copy the appropriate data from nkey
* - otherwise, copy across plain coordinates (no need to transform coordinates)
*/
if (key) {
LISTBASE_FOREACH (KeyBlock *, kb, &key->block) {
- /* get pointer to where to write data for this mesh in shapekey's data array */
+ /* get pointer to where to write data for this mesh in shape-key's data array */
float(*cos)[3] = ((float(*)[3])kb->data) + *vertofs;
- /* check if this was one of the original shapekeys */
+ /* Check if this was one of the original shape-keys. */
KeyBlock *okb = nkey ? BKE_keyblock_find_name(nkey, kb->name) : NULL;
if (okb) {
- /* copy this mesh's shapekey to the destination shapekey */
+ /* copy this mesh's shape-key to the destination shape-key */
float(*ocos)[3] = okb->data;
for (a = 0; a < me->totvert; a++, cos++, ocos++) {
copy_v3_v3(*cos, *ocos);
}
}
else {
- /* copy base-coordinates to the destination shapekey */
+ /* Copy base-coordinates to the destination shape-key. */
for (a = 0, mvert = *mvert_pp; a < me->totvert; a++, cos++, mvert++) {
copy_v3_v3(*cos, mvert->co);
}
@@ -365,7 +365,7 @@ int ED_mesh_join_objects_exec(bContext *C, wmOperator *op)
join_parent = true;
}
- /* check for shapekeys */
+ /* Check for shape-keys. */
if (me->key) {
haskey++;
}
@@ -428,10 +428,10 @@ int ED_mesh_join_objects_exec(bContext *C, wmOperator *op)
/* increase id->us : will be lowered later */
}
- /* - if destination mesh had shapekeys, move them somewhere safe, and set up placeholders
- * with arrays that are large enough to hold shapekey data for all meshes
- * - if destination mesh didn't have shapekeys, but we encountered some in the meshes we're
- * joining, set up a new keyblock and assign to the mesh
+ /* - If destination mesh had shape-keys, move them somewhere safe, and set up placeholders
+ * with arrays that are large enough to hold shape-key data for all meshes.
+ * - If destination mesh didn't have shape-keys, but we encountered some in the meshes we're
+ * joining, set up a new key-block and assign to the mesh.
*/
if (key) {
/* make a duplicate copy that will only be used here... (must remember to free it!) */
@@ -518,8 +518,8 @@ int ED_mesh_join_objects_exec(bContext *C, wmOperator *op)
}
}
- /* if this mesh has shapekeys,
- * check if destination mesh already has matching entries too */
+ /* If this mesh has shape-keys,
+ * check if destination mesh already has matching entries too. */
if (me->key && key) {
/* for remapping KeyBlock.relative */
int *index_map = MEM_mallocN(sizeof(int) * me->key->totkey, __func__);
@@ -713,7 +713,7 @@ int ED_mesh_join_objects_exec(bContext *C, wmOperator *op)
/* other mesh users */
BKE_objects_materials_test_all(bmain, (ID *)me);
- /* free temp copy of destination shapekeys (if applicable) */
+ /* Free temporary copy of destination shape-keys (if applicable). */
if (nkey) {
/* We can assume nobody is using that ID currently. */
BKE_id_free_ex(bmain, nkey, LIB_ID_FREE_NO_UI_USER, false);
diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index 1286f6a818c..410572159bf 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -720,7 +720,7 @@ static void node_socket_draw_multi_input(const float color[4],
{
/* The other sockets are drawn with the keyframe shader. There, the outline has a base thickness
* that can be varied but always scales with the size the socket is drawn at. Using `U.dpi_fac`
- * has the the same effect here. It scales the outline correctly across different screen DPIs
+ * has the same effect here. It scales the outline correctly across different screen DPI's
* and UI scales without being affected by the 'line-width'. */
const float outline_width = NODE_SOCK_OUTLINE_SCALE * U.dpi_fac;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 19:45:04 +0300