[Bf-blender-cvs] [91bca410c0e] master: Cleanup: clang-format

[Aaron Carlisle]

Commit: 91bca410c0e08c6d1cd227336df91faddab7a767
Author: Aaron Carlisle
Date:   Sun Sep 5 23:25:36 2021 -0400
Branches: master
https://developer.blender.org/rB91bca410c0e08c6d1cd227336df91faddab7a767

Cleanup: clang-format

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

M	source/blender/compositor/intern/COM_Converter.cc
M	source/blender/compositor/nodes/COM_PosterizeNode.cc
M	source/blender/draw/engines/overlay/shaders/grid_background_frag.glsl
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/sequencer/intern/effects.c

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

diff --git a/source/blender/compositor/intern/COM_Converter.cc b/source/blender/compositor/intern/COM_Converter.cc
index 6049f14ecdf..4b103c21c75 100644
--- a/source/blender/compositor/intern/COM_Converter.cc
+++ b/source/blender/compositor/intern/COM_Converter.cc
@@ -41,7 +41,6 @@
 #include "COM_ColorExposureNode.h"
 #include "COM_ColorMatteNode.h"
 #include "COM_ColorNode.h"
-#include "COM_PosterizeNode.h"
 #include "COM_ColorRampNode.h"
 #include "COM_ColorSpillNode.h"
 #include "COM_ColorToBWNode.h"
@@ -91,6 +90,7 @@
 #include "COM_OutputFileNode.h"
 #include "COM_PixelateNode.h"
 #include "COM_PlaneTrackDeformNode.h"
+#include "COM_PosterizeNode.h"
 #include "COM_RenderLayersNode.h"
 #include "COM_RotateNode.h"
 #include "COM_ScaleNode.h"
diff --git a/source/blender/compositor/nodes/COM_PosterizeNode.cc b/source/blender/compositor/nodes/COM_PosterizeNode.cc
index 8de42cc4ac4..9f5a69961a4 100644
--- a/source/blender/compositor/nodes/COM_PosterizeNode.cc
+++ b/source/blender/compositor/nodes/COM_PosterizeNode.cc
@@ -17,8 +17,8 @@
  */
 
 #include "COM_PosterizeNode.h"
-#include "COM_PosterizeOperation.h"
 #include "COM_ExecutionSystem.h"
+#include "COM_PosterizeOperation.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/draw/engines/overlay/shaders/grid_background_frag.glsl b/source/blender/draw/engines/overlay/shaders/grid_background_frag.glsl
index fcc05414ea3..f09918da6dc 100644
--- a/source/blender/draw/engines/overlay/shaders/grid_background_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/grid_background_frag.glsl
@@ -6,7 +6,7 @@ out vec4 fragColor;
 
 void main()
 {
-    fragColor = color;
-    float scene_depth = texelFetch(depthBuffer, ivec2(gl_FragCoord.xy), 0).r;
-    fragColor.a = (scene_depth == 1.0) ? 1.0 : 0.0;
+  fragColor = color;
+  float scene_depth = texelFetch(depthBuffer, ivec2(gl_FragCoord.xy), 0).r;
+  fragColor.a = (scene_depth == 1.0) ? 1.0 : 0.0;
 }
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 72d10d840fa..bb05b93ad81 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -3284,7 +3284,8 @@ bGPDstroke *ED_gpencil_stroke_nearest_to_ends(bContext *C,
     gpencil_point_to_parent_space(pt, diff_mat, &pt_parent);
     gpencil_point_to_xy_fl(gsc, gps, &pt_parent, &pt2d_target_end[0], &pt2d_target_end[1]);
 
-    /* If the distance to the original stroke extremes is too big, the stroke must not be joined. */
+    /* If the distance to the original stroke extremes is too big, the stroke must not be joined.
+     */
     if ((len_squared_v2v2(ctrl1, pt2d_target_start) > radius_sqr) &&
         (len_squared_v2v2(ctrl1, pt2d_target_end) > radius_sqr) &&
         (len_squared_v2v2(ctrl2, pt2d_target_start) > radius_sqr) &&
diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c
index 80314d34360..4448db013fe 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -3188,7 +3188,7 @@ float seq_speed_effect_target_frame_get(Scene *scene,
     case SEQ_SPEED_STRETCH: {
       /* Only right handle controls effect speed! */
       const float target_content_length = seq_effect_speed_get_strip_content_length(source) -
-                                  source->startofs;
+                                          source->startofs;
       const float speed_effetct_length = seq_speed->enddisp - seq_speed->startdisp;
       const float ratio = frame_index / speed_effetct_length;
       target_frame = target_content_length * ratio;