Cleanup: clang-format, sorted lists
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Aug 2019 00:11:53 +0000 (10:11 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Aug 2019 12:47:25 +0000 (22:47 +1000)
intern/cycles/kernel/shaders/node_math.osl
source/blender/compositor/CMakeLists.txt
source/blender/draw/intern/draw_cache.h
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_draw.c

index fb59c783770d3995f4521654149a25b781ac8a0e..13e4c91ba10dd8d8bc0e2c3a82732adde771b57e 100644 (file)
@@ -17,7 +17,7 @@
 #include "stdosl.h"
 
 float safe_divide(float a, float b)
-{ 
+{
   return (b != 0.0) ? a / b : 0.0;
 }
 
index 50b5951f99fc2675298a85eec59ab1d6b208d4cb..2a8914c8cd9e21e106518ad5e050739f451d0e40 100644 (file)
@@ -280,8 +280,8 @@ set(SRC
   nodes/COM_BlurNode.h
   nodes/COM_BokehBlurNode.cpp
   nodes/COM_BokehBlurNode.h
-  nodes/COM_DenoiseNode.h
   nodes/COM_DenoiseNode.cpp
+  nodes/COM_DenoiseNode.h
   nodes/COM_DespeckleNode.cpp
   nodes/COM_DespeckleNode.h
   nodes/COM_DilateErodeNode.cpp
@@ -491,8 +491,8 @@ set(SRC
   operations/COM_ConvolutionEdgeFilterOperation.h
   operations/COM_ConvolutionFilterOperation.cpp
   operations/COM_ConvolutionFilterOperation.h
-  operations/COM_DenoiseOperation.h
   operations/COM_DenoiseOperation.cpp
+  operations/COM_DenoiseOperation.h
   operations/COM_DespeckleOperation.cpp
   operations/COM_DespeckleOperation.h
   operations/COM_DilateErodeOperation.cpp
index 5dadcdc145735f53a8321813ee24781793c76dcd..273e97c6e49a3105698fd84e7dad6154bd31d2e5 100644 (file)
@@ -27,8 +27,8 @@ struct GPUBatch;
 struct GPUMaterial;
 struct ModifierData;
 struct Object;
-struct ParticleSystem;
 struct PTCacheEdit;
+struct ParticleSystem;
 
 void DRW_shape_cache_free(void);
 void DRW_shape_cache_reset(void);
index 8a5b30df1a48adec57aad83a1291e4a220b88bb3..a0f493d001103a36ac8ad118723e25f70ad4a080 100644 (file)
@@ -1071,7 +1071,6 @@ static void region_azones_add_edge(ScrArea *sa,
   else if (alignment == RGN_ALIGN_LEFT) {
     region_azone_edge_initialize(sa, ar, AE_RIGHT_TO_TOPLEFT, is_fullscreen);
   }
-
 }
 
 static void region_azones_add(const bScreen *screen, ScrArea *sa, ARegion *ar)
@@ -1089,8 +1088,7 @@ static void region_azones_add(const bScreen *screen, ScrArea *sa, ARegion *ar)
   /* For a split region also continue the azone edge from the next region if this region is aligned
    * with the next */
   if ((ar->alignment & RGN_SPLIT_PREV) && ar->prev) {
-    region_azones_add_edge(
-        sa, ar, RGN_ALIGN_ENUM_FROM_MASK(ar->prev->alignment), is_fullscreen);
+    region_azones_add_edge(sa, ar, RGN_ALIGN_ENUM_FROM_MASK(ar->prev->alignment), is_fullscreen);
   }
 
   if (is_fullscreen) {
index 72fec68070b29b6c68a80cbfd86bd4e5763f2c55..7821540d04593e2cd3af7604257798df0673200b 100644 (file)
@@ -2464,7 +2464,6 @@ static bool is_split_edge(const int alignment, const AZEdge edge)
          ((alignment == RGN_ALIGN_TOP) && (edge == AE_BOTTOM_TO_TOPLEFT)) ||
          ((alignment == RGN_ALIGN_LEFT) && (edge == AE_RIGHT_TO_TOPLEFT)) ||
          ((alignment == RGN_ALIGN_RIGHT) && (edge == AE_LEFT_TO_TOPRIGHT));
-
 }
 
 static int region_scale_invoke(bContext *C, wmOperator *op, const wmEvent *event)
index 7f6dc66d4a7622f4fb4145cb113c20082c8139bf..f6afa112f080319658979a7a0c8b886dd8215c27 100644 (file)
@@ -1560,7 +1560,7 @@ void view3d_main_region_draw(const bContext *C, ARegion *ar)
   GPU_pass_cache_garbage_collect();
 
   /* XXX This is in order to draw UI batches with the DRW
-   * olg context since we now use it for drawing the entire area */
+   * old context since we now use it for drawing the entire area. */
   gpu_batch_presets_reset();
 
   /* No depth test for drawing action zones afterwards. */