Cleanup: clang-format, trailing space
authorCampbell Barton <ideasman42@gmail.com>
Tue, 22 Oct 2019 14:03:31 +0000 (01:03 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 22 Oct 2019 14:06:15 +0000 (01:06 +1100)
intern/CMakeLists.txt
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
source/blender/editors/gpencil/gpencil_primitive.c
tests/gtests/blenlib/BLI_kdopbvh_test.cc

index 4493c68a88dbb4ceab76884b401831a43c5b482c..e6b561c39b94a9452e9d4781e27ed546676d6c41 100644 (file)
@@ -80,4 +80,3 @@ endif()
 if(WITH_QUADRIFLOW)
   add_subdirectory(quadriflow)
 endif()
-
index ff5d2565c26ef3b11700cf15de4f238a836f69de..81f2ff4b53c01e17ef239d5b8c6df3bf98186a6d 100644 (file)
@@ -1357,7 +1357,7 @@ class _defs_gpencil_paint:
             cursor='CROSSHAIR',
             widget=None,
             keymap=(),
-        )        
+        )
 
     @ToolDef.from_fn
     def box():
@@ -1401,7 +1401,7 @@ class _defs_gpencil_paint:
             cursor='CROSSHAIR',
             widget=None,
             keymap=(),
-        )    
+        )
 
     @ToolDef.from_fn
     def eyedropper():
index bf7b2edb0252cd63656a83bb614e648182ffcf2c..e19be2fe086b9ded76c40276eb7f9933527744c4 100644 (file)
@@ -206,7 +206,7 @@ static void gpencil_primitive_constrain(tGPDprimitive *tgpi, bool line_mode)
   else {
     gpencil_primitive_to_square(tgpi, x, y);
   }
- }
+}
 
 /* Helper to rotate point around origin */
 static void gp_rotate_v2_v2v2fl(float v[2],
@@ -458,7 +458,12 @@ static void gpencil_primitive_status_indicators(bContext *C, tGPDprimitive *tgpi
                 UI_MAX_DRAW_STR);
   }
 
-  if (ELEM(tgpi->type, GP_STROKE_CIRCLE, GP_STROKE_ARC, GP_STROKE_LINE, GP_STROKE_BOX, GP_STROKE_POLYLINE)) {
+  if (ELEM(tgpi->type,
+           GP_STROKE_CIRCLE,
+           GP_STROKE_ARC,
+           GP_STROKE_LINE,
+           GP_STROKE_BOX,
+           GP_STROKE_POLYLINE)) {
     if (hasNumInput(&tgpi->num)) {
       char str_offs[NUM_STR_REP_LEN];
 
@@ -1386,7 +1391,7 @@ static void gpencil_primitive_edit_event_handling(
           copy_v2_v2(tgpi->start, tgpi->end);
           copy_v2_v2(tgpi->origin, tgpi->start);
           gp_primitive_update_cps(tgpi);
-          
+
           tgpi->flag = IN_POLYLINE;
           WM_cursor_modal_set(win, WM_CURSOR_CROSS);
         }
@@ -1395,7 +1400,7 @@ static void gpencil_primitive_edit_event_handling(
           gp_primitive_update_cps(tgpi);
           gpencil_primitive_update(C, op, tgpi);
         }
-      }      
+      }
       else if ((event->val == KM_PRESS) && !ELEM(tgpi->type, GP_STROKE_POLYLINE)) {
         /* find nearest cp based on stroke end points */
         if (move == MOVE_ENDS) {
@@ -1580,9 +1585,9 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e
     return OPERATOR_RUNNING_MODAL;
   }
   else if (tgpi->flag == IN_POLYLINE) {
-    
+
     switch (event->type) {
-      
+
       case ESCKEY: {
         /* return to normal cursor and header status */
         ED_workspace_status_text(C, NULL);
@@ -1598,7 +1603,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e
         if (event->val == KM_PRESS) {
           WM_cursor_modal_set(win, WM_CURSOR_CROSS);
           gpencil_primitive_add_segment(tgpi);
-          
+
           gpencil_primitive_update(C, op, tgpi);
           copy_v2_v2(tgpi->start, tgpi->end);
           copy_v2_v2(tgpi->origin, tgpi->end);
@@ -1607,7 +1612,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e
       }
       case SPACEKEY: /* confirm */
       case MIDDLEMOUSE:
-      case RETKEY: 
+      case RETKEY:
       case RIGHTMOUSE: {
         if (event->val == KM_PRESS) {
           tgpi->flag = IDLE;
@@ -1665,7 +1670,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e
         break;
       }
     }
-    
+
     copy_v2_v2(tgpi->mvalo, tgpi->mval);
     return OPERATOR_RUNNING_MODAL;
   }
index ac0d477ee143a426b53f2f94c511d46a0924a820..7e32c545e75fc39ab09683d185523a02bf2a7b06 100644 (file)
@@ -50,7 +50,10 @@ TEST(kdopbvh, Single)
   BLI_bvhtree_free(tree);
 }
 
-static void optimal_check_callback(void *userdata, int index, const float co[3], BVHTreeNearest *nearest)
+static void optimal_check_callback(void *userdata,
+                                   int index,
+                                   const float co[3],
+                                   BVHTreeNearest *nearest)
 {
   float(*points)[3] = (float(*)[3])userdata;