[Bf-blender-cvs] [5c51bf2ffe8] master: Cleanup: format

Campbell Barton noreply at git.blender.org
Tue Oct 4 04:55:05 CEST 2022


Commit: 5c51bf2ffe8fabfd169a891bd8c4c400ae69dfa0
Author: Campbell Barton
Date:   Tue Oct 4 13:54:02 2022 +1100
Branches: master
https://developer.blender.org/rB5c51bf2ffe8fabfd169a891bd8c4c400ae69dfa0

Cleanup: format

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

M	source/blender/editors/gpencil/gpencil_select.c
M	source/blender/editors/space_file/asset_catalog_tree_view.cc
M	source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc
M	source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc
M	source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc
M	source/blender/windowmanager/intern/wm_dragdrop.cc

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

diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
index 167bfec0b6e..16eff0fe41d 100644
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -2072,7 +2072,8 @@ static bool gpencil_generic_stroke_select(bContext *C,
       bGPDspoint *pt_active = (pt->runtime.pt_orig) ? pt->runtime.pt_orig : pt;
 
       /* Convert point coords to screen-space. */
-      const bool is_inside = is_inside_fn(gsc.region, gpstroke_iter.diff_mat, &pt_active->x, user_data);
+      const bool is_inside = is_inside_fn(
+          gsc.region, gpstroke_iter.diff_mat, &pt_active->x, user_data);
       if (strokemode == false) {
         const bool is_select = (pt_active->flag & GP_SPOINT_SELECT) != 0;
         const int sel_op_result = ED_select_op_action_deselected(sel_op, is_select, is_inside);
diff --git a/source/blender/editors/space_file/asset_catalog_tree_view.cc b/source/blender/editors/space_file/asset_catalog_tree_view.cc
index a45dd078401..4eb2958f5a2 100644
--- a/source/blender/editors/space_file/asset_catalog_tree_view.cc
+++ b/source/blender/editors/space_file/asset_catalog_tree_view.cc
@@ -598,7 +598,7 @@ std::string AssetCatalogTreeViewAllItem::DropController::drop_tooltip(const wmDr
          TIP_("to the top level of the tree");
 }
 
-bool AssetCatalogTreeViewAllItem::DropController::on_drop(struct bContext */*C*/,
+bool AssetCatalogTreeViewAllItem::DropController::on_drop(struct bContext * /*C*/,
                                                           const wmDrag &drag)
 {
   BLI_assert(drag.type == WM_DRAG_ASSET_CATALOG);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc
index 74bfc3966a3..cc32c8f5efc 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc
@@ -93,7 +93,7 @@ static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
   uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE);
 }
 
-static void node_init(bNodeTree */*tree*/, bNode *node)
+static void node_init(bNodeTree * /*tree*/, bNode *node)
 {
   NodeGeometryCurvePrimitiveArc *data = MEM_cnew<NodeGeometryCurvePrimitiveArc>(__func__);
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc
index 3741301c922..6b402a67450 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc
@@ -44,7 +44,7 @@ static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
   uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE);
 }
 
-static void node_init(bNodeTree */*tree*/, bNode *node)
+static void node_init(bNodeTree * /*tree*/, bNode *node)
 {
   NodeGeometryCurvePrimitiveLine *data = MEM_cnew<NodeGeometryCurvePrimitiveLine>(__func__);
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc b/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc
index a6e02a82c99..75d43d2f771 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc
@@ -16,7 +16,7 @@ class InstanceRotationFieldInput final : public bke::InstancesFieldInput {
   }
 
   GVArray get_varray_for_context(const InstancesComponent &instances,
-                                const IndexMask /*mask*/) const final
+                                 const IndexMask /*mask*/) const final
   {
     auto rotation_fn = [&](const int i) -> float3 {
       return instances.instance_transforms()[i].to_euler();
diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc
index 63f3bbe2c92..0896daec561 100644
--- a/source/blender/windowmanager/intern/wm_dragdrop.cc
+++ b/source/blender/windowmanager/intern/wm_dragdrop.cc
@@ -471,7 +471,7 @@ void wm_drop_prepare(bContext *C, wmDrag *drag, wmDropBox *drop)
   wm_drags_exit(CTX_wm_manager(C), CTX_wm_window(C));
 }
 
-void wm_drop_end(bContext *C, wmDrag */*drag*/, wmDropBox */*drop*/)
+void wm_drop_end(bContext *C, wmDrag * /*drag*/, wmDropBox * /*drop*/)
 {
   CTX_store_set(C, nullptr);
 }
@@ -496,7 +496,7 @@ void wm_drags_check_ops(bContext *C, const wmEvent *event)
   }
 }
 
-wmOperatorCallContext wm_drop_operator_context_get(const wmDropBox */*drop*/)
+wmOperatorCallContext wm_drop_operator_context_get(const wmDropBox * /*drop*/)
 {
   return WM_OP_INVOKE_DEFAULT;
 }
@@ -818,10 +818,7 @@ static int wm_drag_imbuf_icon_height_get(const wmDrag *drag)
   return round_fl_to_int(drag->imb->y * drag->imbuf_scale);
 }
 
-static void wm_drag_draw_icon(bContext * /*C*/,
-                              wmWindow */*win*/,
-                              wmDrag *drag,
-                              const int xy[2])
+static void wm_drag_draw_icon(bContext * /*C*/, wmWindow * /*win*/, wmDrag *drag, const int xy[2])
 {
   int x, y;
 
@@ -867,10 +864,7 @@ static void wm_drag_draw_item_name(wmDrag *drag, const int x, const int y)
   UI_fontstyle_draw_simple(fstyle, x, y, WM_drag_get_item_name(drag), text_col);
 }
 
-void WM_drag_draw_item_name_fn(bContext * /*C*/,
-                               wmWindow */*win*/,
-                               wmDrag *drag,
-                               const int xy[2])
+void WM_drag_draw_item_name_fn(bContext * /*C*/, wmWindow * /*win*/, wmDrag *drag, const int xy[2])
 {
   int x = xy[0] + 10 * UI_DPI_FAC;
   int y = xy[1] + 1 * UI_DPI_FAC;



More information about the Bf-blender-cvs mailing list