[Bf-blender-cvs] [c4dfe8f9d87] cycles-x: Cleanup: clang-format

[Brecht Van Lommel]

Commit: c4dfe8f9d87537174df8b91439202d117a102171
Author: Brecht Van Lommel
Date:   Wed Aug 4 20:42:21 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBc4dfe8f9d87537174df8b91439202d117a102171

Cleanup: clang-format

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

M	intern/cycles/device/cpu/device_impl.cpp
M	intern/cycles/integrator/denoiser_oidn.h
M	intern/cycles/kernel/svm/svm_light_path.h

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

diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp
index 4d262db90d1..a1601a6461f 100644
--- a/intern/cycles/device/cpu/device_impl.cpp
+++ b/intern/cycles/device/cpu/device_impl.cpp
@@ -55,8 +55,8 @@
 #include "util/util_function.h"
 #include "util/util_logging.h"
 #include "util/util_map.h"
-#include "util/util_openimagedenoise.h"
 #include "util/util_opengl.h"
+#include "util/util_openimagedenoise.h"
 #include "util/util_optimization.h"
 #include "util/util_progress.h"
 #include "util/util_system.h"
diff --git a/intern/cycles/integrator/denoiser_oidn.h b/intern/cycles/integrator/denoiser_oidn.h
index 43a1cd4ccd4..c672ab8b5bb 100644
--- a/intern/cycles/integrator/denoiser_oidn.h
+++ b/intern/cycles/integrator/denoiser_oidn.h
@@ -32,7 +32,7 @@ class OIDNDenoiser : public Denoiser {
   OIDNDenoiser(Device *path_trace_device, const DenoiseParams &params);
   ~OIDNDenoiser();
 
-    virtual void denoise_buffer(const BufferParams &buffer_params,
+  virtual void denoise_buffer(const BufferParams &buffer_params,
                               RenderBuffers *render_buffers,
                               const int num_samples,
                               bool allow_inplace_modification) override;
diff --git a/intern/cycles/kernel/svm/svm_light_path.h b/intern/cycles/kernel/svm/svm_light_path.h
index 50a641f6fb2..49fabad1cc5 100644
--- a/intern/cycles/kernel/svm/svm_light_path.h
+++ b/intern/cycles/kernel/svm/svm_light_path.h
@@ -62,10 +62,9 @@ ccl_device_noinline void svm_node_light_path(INTEGRATOR_STATE_CONST_ARGS,
       /* Read bounce from difference location depending if this is a shadow
        * path. It's a bit dubious to have integrate state details leak into
        * this function but hard to avoid currently. */
-      int bounce = (INTEGRATOR_STATE_IS_NULL) ?
-                       0 :
-                       (path_flag & PATH_RAY_SHADOW) ? INTEGRATOR_STATE(shadow_path, bounce) :
-                                                       INTEGRATOR_STATE(path, bounce);
+      int bounce = (INTEGRATOR_STATE_IS_NULL)    ? 0 :
+                   (path_flag & PATH_RAY_SHADOW) ? INTEGRATOR_STATE(shadow_path, bounce) :
+                                                   INTEGRATOR_STATE(path, bounce);
 
       /* For background, light emission and shadow evaluation we from a
        * surface or volume we are effective one bounce further. */
@@ -80,7 +79,7 @@ ccl_device_noinline void svm_node_light_path(INTEGRATOR_STATE_CONST_ARGS,
     case NODE_LP_ray_transparent: {
       const int bounce = (INTEGRATOR_STATE_IS_NULL) ?
                              0 :
-                             (path_flag & PATH_RAY_SHADOW) ?
+                         (path_flag & PATH_RAY_SHADOW) ?
                              INTEGRATOR_STATE(shadow_path, transparent_bounce) :
                              INTEGRATOR_STATE(path, transparent_bounce);