Cleanup: clang-format

JannesN · Mar 24, 2022 · 7a02833 · 7a02833
1 parent 8d42446
commit 7a02833
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 19 deletions.
diff --git a/intern/cycles/hydra/curves.h b/intern/cycles/hydra/curves.h
@@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 
 class HdCyclesCurves final : public HdCyclesGeometry<PXR_NS::HdBasisCurves, CCL_NS::Hair> {
  public:
-  HdCyclesCurves(const PXR_NS::SdfPath &rprimId
+  HdCyclesCurves(
+      const PXR_NS::SdfPath &rprimId
 #if PXR_VERSION < 2102
-                 ,
-                 const PXR_NS::SdfPath &instancerId = {}
+      ,
+      const PXR_NS::SdfPath &instancerId = {}
 #endif
   );
   ~HdCyclesCurves() override;

diff --git a/intern/cycles/hydra/mesh.h b/intern/cycles/hydra/mesh.h
@@ -14,10 +14,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 
 class HdCyclesMesh final : public HdCyclesGeometry<PXR_NS::HdMesh, CCL_NS::Mesh> {
  public:
-  HdCyclesMesh(const PXR_NS::SdfPath &rprimId
+  HdCyclesMesh(
+      const PXR_NS::SdfPath &rprimId
 #if PXR_VERSION < 2102
-               ,
-               const PXR_NS::SdfPath &instancerId = {}
+      ,
+      const PXR_NS::SdfPath &instancerId = {}
 #endif
   );
   ~HdCyclesMesh() override;

diff --git a/intern/cycles/hydra/node_util.h b/intern/cycles/hydra/node_util.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "hydra/config.h"
 #include "graph/node.h"
+#include "hydra/config.h"
 
 #include <pxr/base/vt/value.h>
 

diff --git a/intern/cycles/hydra/pointcloud.h b/intern/cycles/hydra/pointcloud.h
@@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 
 class HdCyclesPoints final : public HdCyclesGeometry<PXR_NS::HdPoints, CCL_NS::PointCloud> {
  public:
-  HdCyclesPoints(const PXR_NS::SdfPath &rprimId
+  HdCyclesPoints(
+      const PXR_NS::SdfPath &rprimId
 #if PXR_VERSION < 2102
-                 ,
-                 const PXR_NS::SdfPath &instancerId = {}
+      ,
+      const PXR_NS::SdfPath &instancerId = {}
 #endif
   );
   ~HdCyclesPoints() override;

diff --git a/intern/cycles/hydra/volume.h b/intern/cycles/hydra/volume.h
@@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE
 
 class HdCyclesVolume final : public HdCyclesGeometry<PXR_NS::HdVolume, CCL_NS::Volume> {
  public:
-  HdCyclesVolume(const PXR_NS::SdfPath &rprimId
+  HdCyclesVolume(
+      const PXR_NS::SdfPath &rprimId
 #if PXR_VERSION < 2102
-                 ,
-                 const PXR_NS::SdfPath &instancerId = {}
+      ,
+      const PXR_NS::SdfPath &instancerId = {}
 #endif
   );
   ~HdCyclesVolume() override;

diff --git a/intern/cycles/scene/integrator.cpp b/intern/cycles/scene/integrator.cpp
@@ -109,8 +109,10 @@ NODE_DEFINE(Integrator)
   SOCKET_INT(denoise_start_sample, "Start Sample to Denoise", 0);
   SOCKET_BOOLEAN(use_denoise_pass_albedo, "Use Albedo Pass for Denoiser", true);
   SOCKET_BOOLEAN(use_denoise_pass_normal, "Use Normal Pass for Denoiser", true);
-  SOCKET_ENUM(
-      denoiser_prefilter, "Denoiser Prefilter", denoiser_prefilter_enum, DENOISER_PREFILTER_ACCURATE);
+  SOCKET_ENUM(denoiser_prefilter,
+              "Denoiser Prefilter",
+              denoiser_prefilter_enum,
+              DENOISER_PREFILTER_ACCURATE);
 
   return type;
 }

diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -382,8 +382,8 @@ void OBJMesh::store_normal_coords_and_indices()
   normal_to_index.reserve(export_mesh_eval_->totpoly);
   loop_to_normal_index_.resize(export_mesh_eval_->totloop);
   loop_to_normal_index_.fill(-1);
-  const float(*lnors)[3] = (const float(*)[3])(
-      CustomData_get_layer(&export_mesh_eval_->ldata, CD_NORMAL));
+  const float(
+      *lnors)[3] = (const float(*)[3])(CustomData_get_layer(&export_mesh_eval_->ldata, CD_NORMAL));
   for (int poly_index = 0; poly_index < export_mesh_eval_->totpoly; ++poly_index) {
     const MPoly &mpoly = export_mesh_eval_->mpoly[poly_index];
     bool need_per_loop_normals = lnors != nullptr || (mpoly.flag & ME_SMOOTH);

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
@@ -6213,7 +6213,8 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "hair_subdiv", PROP_INT, PROP_NONE);
   RNA_def_property_range(prop, 0, 3);
-  RNA_def_property_ui_text(prop, "Additional Subdivision", "Additional subdivision along the hair");
+  RNA_def_property_ui_text(
+      prop, "Additional Subdivision", "Additional subdivision along the hair");
   RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_glsl_update");
 
   /* Performance */

diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc
@@ -239,7 +239,7 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
     return;
   }
   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_("Vector"), [](LinkSearchOpParams &params) {
       bNode &node = params.add_node("ShaderNodeTexSky");
       NodeTexSky *tex = (NodeTexSky *)node.storage;