[Bf-blender-cvs] [27fea7a3a57] master: Cleanup: clang-format

[Campbell Barton]

Commit: 27fea7a3a57e944a318dddd8f63736218576df01
Author: Campbell Barton
Date:   Mon Apr 4 12:25:03 2022 +1000
Branches: master
https://developer.blender.org/rB27fea7a3a57e944a318dddd8f63736218576df01

Cleanup: clang-format

Add ccl_gpu_kernel_postfix as a statement macro to prevent the following
declarations from being indented.

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

M	.clang-format
M	intern/cycles/kernel/integrator/mnee.h
M	source/blender/draw/engines/workbench/workbench_shadow.c
M	source/blender/draw/intern/draw_manager_data.c
M	source/blender/editors/interface/interface_region_menu_pie.cc
M	source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
M	source/blender/editors/space_outliner/tree/tree_display_override_library_properties.cc

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

diff --git a/.clang-format b/.clang-format
index 44c8cb90b15..f7b785adaf2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -269,6 +269,7 @@ ForEachMacros:
 StatementMacros:
   - PyObject_HEAD
   - PyObject_VAR_HEAD
+  - ccl_gpu_kernel_postfix
 
 MacroBlockBegin: "^BSDF_CLOSURE_CLASS_BEGIN$"
 MacroBlockEnd: "^BSDF_CLOSURE_CLASS_END$"
diff --git a/intern/cycles/kernel/integrator/mnee.h b/intern/cycles/kernel/integrator/mnee.h
index af2032c9b99..008c7be0796 100644
--- a/intern/cycles/kernel/integrator/mnee.h
+++ b/intern/cycles/kernel/integrator/mnee.h
@@ -97,7 +97,7 @@ ccl_device_inline float mat22_determinant(const float4 m)
 }
 
 /* Inverse of a 2x2 matrix encoded in a row-major order float4 */
-ccl_device_inline float mat22_inverse(const float4 m, ccl_private float4& m_inverse)
+ccl_device_inline float mat22_inverse(const float4 m, ccl_private float4 &m_inverse)
 {
   float det = mat22_determinant(m);
   if (fabsf(det) < MNEE_MIN_DETERMINANT)
diff --git a/source/blender/draw/engines/workbench/workbench_shadow.c b/source/blender/draw/engines/workbench/workbench_shadow.c
index 588c7240ab2..0b34e849049 100644
--- a/source/blender/draw/engines/workbench/workbench_shadow.c
+++ b/source/blender/draw/engines/workbench/workbench_shadow.c
@@ -167,8 +167,8 @@ void workbench_shadow_cache_init(WORKBENCH_Data *data)
 }
 
 static const BoundBox *workbench_shadow_object_shadow_bbox_get(WORKBENCH_PrivateData *wpd,
-                                                         Object *ob,
-                                                         WORKBENCH_ObjectData *oed)
+                                                               Object *ob,
+                                                               WORKBENCH_ObjectData *oed)
 {
   if (oed->shadow_bbox_dirty || wpd->shadow_changed) {
     float tmp_mat[4][4];
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 8c7cd6d1648..39f083aaf96 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -614,7 +614,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
   drw_call_calc_orco(ob, ob_infos->orcotexfac);
   /* Random float value. */
   uint random = (DST.dupli_source) ?
-                    DST.dupli_source->random_id :
+                     DST.dupli_source->random_id :
                      /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
                       * put it in ob->runtime and make depsgraph ensure it is up to date. */
                      BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
diff --git a/source/blender/editors/interface/interface_region_menu_pie.cc b/source/blender/editors/interface/interface_region_menu_pie.cc
index 586aeef44fd..d30797cc4d0 100644
--- a/source/blender/editors/interface/interface_region_menu_pie.cc
+++ b/source/blender/editors/interface/interface_region_menu_pie.cc
@@ -303,7 +303,7 @@ int UI_pie_menu_invoke_from_rna_enum(struct bContext *C,
  * - Julian (Feb 2016)
  * \{ */
 
- struct PieMenuLevelData {
+struct PieMenuLevelData {
   char title[UI_MAX_NAME_STR]; /* parent pie title, copied for level */
   int icon;                    /* parent pie icon, copied for level */
   int totitem;                 /* total count of *remaining* items */
@@ -313,7 +313,7 @@ int UI_pie_menu_invoke_from_rna_enum(struct bContext *C,
   const char *propname;
   IDProperty *properties;
   wmOperatorCallContext context, flag;
-} ;
+};
 
 /**
  * Invokes a new pie menu for a new level.
diff --git a/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc b/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
index 4b568a6004d..38025b58fd2 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
@@ -211,8 +211,8 @@ static int build_hierarchy_foreach_ID_cb(LibraryIDLinkCallbackData *cb_data)
 }
 
 void TreeDisplayOverrideLibraryHierarchies::build_hierarchy_for_ID(Main *bmain,
-                                                                 ID &override_root_id,
-                                                                 TreeElementID &te_id) const
+                                                                   ID &override_root_id,
+                                                                   TreeElementID &te_id) const
 {
   BuildHierarchyForeachIDCbData build_data{*bmain, space_outliner_, override_root_id, &te_id};
   build_data.parent_ids.add(&override_root_id);
diff --git a/source/blender/editors/space_outliner/tree/tree_display_override_library_properties.cc b/source/blender/editors/space_outliner/tree/tree_display_override_library_properties.cc
index 4c57f91a0a7..5713a4a6a1f 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_override_library_properties.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_override_library_properties.cc
@@ -25,7 +25,8 @@ namespace blender::ed::outliner {
 /* Convenience/readability. */
 template<typename T> using List = ListBaseWrapper<T>;
 
-TreeDisplayOverrideLibraryProperties::TreeDisplayOverrideLibraryProperties(SpaceOutliner &space_outliner)
+TreeDisplayOverrideLibraryProperties::TreeDisplayOverrideLibraryProperties(
+    SpaceOutliner &space_outliner)
     : AbstractTreeDisplay(space_outliner)
 {
 }