[Bf-blender-cvs] [35ddcb4041e] master: Cleanup: clang-format, spelling

Campbell Barton noreply at git.blender.org
Thu Feb 11 22:10:44 CET 2021


Commit: 35ddcb4041e0c98f9a77827e0b8b031c83cec253
Author: Campbell Barton
Date:   Fri Feb 12 07:47:02 2021 +1100
Branches: master
https://developer.blender.org/rB35ddcb4041e0c98f9a77827e0b8b031c83cec253

Cleanup: clang-format, spelling

===================================================================

M	intern/ghost/intern/GHOST_SystemX11.cpp
M	source/blender/editors/sculpt_paint/paint_mask.c
M	source/blender/editors/space_node/node_draw.c
M	source/blender/imbuf/IMB_imbuf.h
M	source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc

===================================================================

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, ""},
 };



More information about the Bf-blender-cvs mailing list