[Bf-blender-cvs] [d195deef5cb] master: Cleanup: clang-format

[Campbell Barton]

Commit: d195deef5cbfe2951dceb2a11959091fbd263440
Author: Campbell Barton
Date:   Wed Mar 11 19:23:52 2020 +1100
Branches: master
https://developer.blender.org/rBd195deef5cbfe2951dceb2a11959091fbd263440

Cleanup: clang-format

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

M	intern/cycles/kernel/kernel_random.h
M	intern/ghost/intern/GHOST_SystemWin32.cpp
M	source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h
index ec41ef2f0e9..f4c3b36e778 100644
--- a/intern/cycles/kernel/kernel_random.h
+++ b/intern/cycles/kernel/kernel_random.h
@@ -302,7 +302,7 @@ ccl_device_inline bool sample_is_even(int pattern, int sample)
 #elif defined(__KERNEL_OPENCL__)
     return popcount(sample & 0xaaaaaaaa) & 1;
 #else
-/* TODO(Stefan): popcnt intrinsic for Windows with fallback for older CPUs. */
+    /* TODO(Stefan): popcnt intrinsic for Windows with fallback for older CPUs. */
     int i = sample & 0xaaaaaaaa;
     i = i - ((i >> 1) & 0x55555555);
     i = (i & 0x33333333) + ((i >> 2) & 0x33333333);
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 5bf40ba33d0..d03b9343eab 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1052,7 +1052,7 @@ GHOST_EventKey *GHOST_SystemWin32::processKeyEvent(GHOST_WindowWin32 *window, RA
     /* Unlike on Linux, not all keys can send repeat events. E.g. modifier keys don't. */
     if (keyDown) {
       if (system->m_keycode_last_repeat_key == vk) {
-          is_repeat = true;
+        is_repeat = true;
       }
       system->m_keycode_last_repeat_key = vk;
     }
diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c
index 038d0e5a08c..f2671b66f7f 100644
--- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c
+++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c
@@ -58,7 +58,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-
 typedef struct MultiplaneScrapeSampleData {
   float area_cos[2][3];
   float area_nos[2][3];
@@ -223,7 +222,6 @@ static void do_multiplane_scrape_brush_task_cb_ex(void *__restrict userdata,
   BKE_pbvh_vertex_iter_end;
 }
 
-
 /* Public functions. */
 
 /* Main Brush Function. */
@@ -400,9 +398,9 @@ void SCULPT_do_multiplane_scrape_brush(Sculpt *sd, Object *ob, PBVHNode **nodes,
 }
 
 void SCULPT_multiplane_scrape_preview_draw(const uint gpuattr,
-                                                  SculptSession *ss,
-                                                  const float outline_col[3],
-                                                  const float outline_alpha)
+                                           SculptSession *ss,
+                                           const float outline_col[3],
+                                           const float outline_alpha)
 {
   float local_mat_inv[4][4];
   invert_m4_m4(local_mat_inv, ss->cache->stroke_local_mat);
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index ac0376c72af..a153c1dda1e 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -5040,8 +5040,16 @@ static void rna_def_userdef_system(BlenderRNA *brna)
       {2048, "SAMPLES_2048", 0, "2048 Samples", "Set audio mixing buffer size to 2048 samples"},
       {4096, "SAMPLES_4096", 0, "4096 Samples", "Set audio mixing buffer size to 4096 samples"},
       {8192, "SAMPLES_8192", 0, "8192 Samples", "Set audio mixing buffer size to 8192 samples"},
-      {16384, "SAMPLES_16384", 0, "16384 Samples", "Set audio mixing buffer size to 16384 samples"},
-      {32768, "SAMPLES_32768", 0, "32768 Samples", "Set audio mixing buffer size to 32768 samples"},
+      {16384,
+       "SAMPLES_16384",
+       0,
+       "16384 Samples",
+       "Set audio mixing buffer size to 16384 samples"},
+      {32768,
+       "SAMPLES_32768",
+       0,
+       "32768 Samples",
+       "Set audio mixing buffer size to 32768 samples"},
       {0, NULL, 0, NULL, NULL},
   };