[Bf-blender-cvs] [807efa8538c] master: Cleanup: clang-format

Campbell Barton noreply at git.blender.org
Thu Dec 16 01:42:37 CET 2021


Commit: 807efa8538c502a0017c48029ff8f0805ceea2a6
Author: Campbell Barton
Date:   Thu Dec 16 11:38:08 2021 +1100
Branches: master
https://developer.blender.org/rB807efa8538c502a0017c48029ff8f0805ceea2a6

Cleanup: clang-format

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

M	source/blender/imbuf/intern/transform.cc
M	source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc

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

diff --git a/source/blender/imbuf/intern/transform.cc b/source/blender/imbuf/intern/transform.cc
index 82c8747d28d..3e071a9e4d7 100644
--- a/source/blender/imbuf/intern/transform.cc
+++ b/source/blender/imbuf/intern/transform.cc
@@ -322,15 +322,8 @@ class Sampler {
     }
     else if constexpr (Filter == IMB_FILTER_BILINEAR && std::is_same_v<StorageType, float>) {
       if constexpr (std::is_same_v<UVWrapping, WrapRepeatUV>) {
-        BLI_bilinear_interpolation_wrap_fl(source->rect_float,
-                                           &r_sample[0],
-                                           source->x,
-                                           source->y,
-                                           NumChannels,
-                                           u,
-                                           v,
-                                           true,
-                                           true);
+        BLI_bilinear_interpolation_wrap_fl(
+            source->rect_float, &r_sample[0], source->x, source->y, NumChannels, u, v, true, true);
       }
       else {
         BLI_bilinear_interpolation_fl(source->rect_float,
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
index 41ad4d79f1e..9a87c040bdf 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
@@ -110,7 +110,7 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
     return;
   }
   else if (params.node_tree().typeinfo->validate_link(
-          static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_FLOAT)) {
+               static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_FLOAT)) {
     params.add_item(IFACE_("Count"), [](LinkSearchOpParams &params) {
       bNode &node = params.add_node("GeometryNodeMeshLine");
       node_storage(node).mode = GEO_NODE_MESH_LINE_MODE_OFFSET;



More information about the Bf-blender-cvs mailing list