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:
authorCampbell Barton <campbell@blender.org>2022-09-29 03:28:39 +0300
committerJeroen Bakker <jeroen@blender.org>2022-10-03 15:59:17 +0300
commitabd5f0a77f8d732da39aede403615fd6bb57ac40 (patch)
tree30011c5210da4667b40dc0c2c42bd7d708dfeab0
parent0b410eaf63e680cb811c73ca23fa8644b5a96889 (diff)
Cleanup: spelling in comments
-rw-r--r--source/blender/blenkernel/intern/mesh.cc2
-rw-r--r--source/blender/draw/intern/draw_pbvh.cc4
-rw-r--r--source/blender/editors/animation/anim_channels_edit.c2
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_paint_color.c5
-rw-r--r--source/blender/editors/space_graph/space_graph.c2
-rw-r--r--source/blender/editors/space_node/drawnode.cc2
-rw-r--r--source/blender/editors/space_node/node_relationships.cc4
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.cc4
8 files changed, 12 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 4d98efde5f9..9e7821428d1 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -494,7 +494,7 @@ static int customdata_compare(
}
if (layer_count1 != layer_count2) {
- /* TODO(@HooglyBoogly): Reenable after tests are updated for material index refactor. */
+ /* TODO(@HooglyBoogly): Re-enable after tests are updated for material index refactor. */
// return MESHCMP_CDLAYERS_MISMATCH;
}
diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc
index 94965c25950..7b36cb16cac 100644
--- a/source/blender/draw/intern/draw_pbvh.cc
+++ b/source/blender/draw/intern/draw_pbvh.cc
@@ -4,8 +4,8 @@
/** \file
* \ingroup gpu
*
- * PBVH drawing. Embedds GPU meshes inside of PBVH nodes,
- * used by mesh sculpt mode.
+ * PBVH drawing.
+ * Embeds GPU meshes inside of PBVH nodes, used by mesh sculpt mode.
*/
#include <limits.h>
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index ea631da27af..0c9b82d2afc 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2422,7 +2422,7 @@ static void ANIM_OT_channels_clean_empty(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-/* ******************* Reenable Disabled Operator ******************* */
+/* ******************* Re-enable Disabled Operator ******************* */
static bool animchannels_enable_poll(bContext *C)
{
diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_color.c b/source/blender/editors/sculpt_paint/sculpt_paint_color.c
index 906b71f899b..1815f4899ff 100644
--- a/source/blender/editors/sculpt_paint/sculpt_paint_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.c
@@ -195,9 +195,8 @@ static void do_paint_brush_task_cb_ex(void *__restrict userdata,
paint_color, paint_color, wet_mix_color, ss->cache->paint_brush.wet_mix);
blend_color_mix_float(color_buffer->color[vd.i], color_buffer->color[vd.i], paint_color);
- /* Final mix over the original color using brush alpha. We apply automaking again
- * at this point to avoid washing out non-binary masking modes like cavity masking.
- */
+ /* Final mix over the original color using brush alpha. We apply auto-making again
+ * at this point to avoid washing out non-binary masking modes like cavity masking. */
float automasking = SCULPT_automasking_factor_get(ss->cache->automasking, ss, vd.vertex);
mul_v4_v4fl(buffer_color, color_buffer->color[vd.i], brush->alpha * automasking);
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index fa2029db835..1dc02fee59d 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -838,7 +838,7 @@ static void graph_blend_write(BlendWriter *writer, SpaceLink *sl)
BLO_write_struct(writer, bDopeSheet, sipo->ads);
}
- /* reenable ghost curves */
+ /* Re-enable ghost curves. */
sipo->runtime.ghost_curves = tmpGhosts;
}
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index 13d13b10339..93166c6de59 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -1983,7 +1983,7 @@ static void node_draw_link_end_marker(const float2 center,
UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_4fv(&rect, true, radius, color);
- /* Roundbox disables alpha. Reenable it for node links that are drawn after this one. */
+ /* Round-box disables alpha. Re-enable it for node links that are drawn after this one. */
GPU_blend(GPU_BLEND_ALPHA);
}
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index 84cef798907..d9f87433c53 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -551,7 +551,7 @@ static bNodeSocket *determine_socket_to_view(bNode &node_to_view)
}
if (last_linked_socket_index == -1) {
- /* Returnt he first socket that can be viewed. */
+ /* Return the first socket that can be viewed. */
for (bNodeSocket *socket : node_to_view.output_sockets()) {
if (socket_can_be_viewed(*socket)) {
return socket;
@@ -932,7 +932,7 @@ static void node_link_exit(bContext &C, wmOperator &op, const bool apply_links)
ED_node_tree_propagate_change(&C, bmain, &ntree);
- /* Ensure draglink tooltip is disabled. */
+ /* Ensure drag-link tool-tip is disabled. */
draw_draglink_tooltip_deactivate(*CTX_wm_region(&C), *nldrag);
ED_workspace_status_text(&C, nullptr);
diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc
index 76f93e5f518..dd0f02a63c1 100644
--- a/source/blender/editors/space_outliner/outliner_draw.cc
+++ b/source/blender/editors/space_outliner/outliner_draw.cc
@@ -2985,7 +2985,7 @@ static void outliner_draw_iconrow_number(const uiFontStyle *fstyle,
number_text,
text_col);
UI_fontstyle_set(fstyle);
- GPU_blend(GPU_BLEND_ALPHA); /* Roundbox and text drawing disables. */
+ GPU_blend(GPU_BLEND_ALPHA); /* Round-box and text drawing disables. */
}
static void outliner_icon_background_colors(float icon_color[4], float icon_border[4])
@@ -3015,7 +3015,7 @@ static void outliner_draw_active_indicator(const float minx,
UI_draw_roundbox_corner_set(UI_CNR_ALL);
UI_draw_roundbox_aa(&rect, true, radius, icon_color);
UI_draw_roundbox_aa(&rect, false, radius, icon_border);
- GPU_blend(GPU_BLEND_ALPHA); /* Roundbox disables. */
+ GPU_blend(GPU_BLEND_ALPHA); /* Round-box disables. */
}
static void outliner_draw_iconrow_doit(uiBlock *block,