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 <ideasman42@gmail.com>2021-02-11 23:47:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-02-11 23:49:40 +0300
commit35ddcb4041e0c98f9a77827e0b8b031c83cec253 (patch)
tree6773aa48d3f95cadcbf32235494a1c2792439ee6
parentb6d7aa9e137488a758be23e841983827c5230e14 (diff)
Cleanup: clang-format, spelling
-rw-r--r--intern/ghost/intern/GHOST_SystemX11.cpp2
-rw-r--r--source/blender/editors/sculpt_paint/paint_mask.c2
-rw-r--r--source/blender/editors/space_node/node_draw.c4
-rw-r--r--source/blender/imbuf/IMB_imbuf.h2
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc18
5 files changed, 13 insertions, 15 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 9152aa22495..53e52d40dec 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1061,7 +1061,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe)
* Note that:
* - This effectively 'lock' main number keys to always output number events
* (except when using alt-gr).
- * - This enforces users to use an ascii-compatible keymap with Blender -
+ * - This enforces users to use an ASCII-compatible keymap with Blender -
* but at least it gives predictable and consistent results.
*
* Also, note that nothing in XLib sources [1] makes it obvious why those two functions give
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index bacb3b549e3..26e2bcc42cf 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -1073,8 +1073,6 @@ static void sculpt_gesture_trim_calculate_depth(SculptGestureContext *sgcontext)
mid_point_depth = ss->gesture_initial_hit ?
0.0f :
(trim_operation->depth_back + trim_operation->depth_front) * 0.5f;
-
-
}
const float depth_radius = ss->cursor_radius;
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 9ef914af75b..c7be5f848f7 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1153,8 +1153,8 @@ void node_draw_sockets(const View2D *v2d,
GPU_program_point_size(false);
GPU_blend(GPU_BLEND_NONE);
- /* Draw multi-nput sockets after the others because they are drawn with "UI_roundbox"
- * rather than with GL_POINT. */
+ /* Draw multi-input sockets after the others because they are drawn with `UI_draw_roundbox`
+ * rather than with `GL_POINT`. */
LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
if (nodeSocketIsHidden(socket)) {
continue;
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 8866a8a8600..d131e4dacdc 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -27,7 +27,7 @@
* This module offers import/export of several graphical file formats.
* \ingroup imbuf
*
- * \page IMB Imbuf module external interface
+ * \page IMB ImBuf module external interface
* \section imb_about About the IMB module
*
* External interface of the IMage Buffer module. This module offers
diff --git a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
index a56939a43c7..ca2e1be6e6f 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
@@ -25,15 +25,15 @@
static bNodeSocketTemplate geo_node_join_geometry_in[] = {
{SOCK_GEOMETRY,
- N_("Geometry"),
- 0.0f,
- 0.0f,
- 0.0f,
- 1.0f,
- -1.0f,
- 1.0f,
- PROP_NONE,
- SOCK_MULTI_INPUT},
+ N_("Geometry"),
+ 0.0f,
+ 0.0f,
+ 0.0f,
+ 1.0f,
+ -1.0f,
+ 1.0f,
+ PROP_NONE,
+ SOCK_MULTI_INPUT},
{-1, ""},
};