From eae081f8fd571cc7bed79acf356efc14f276a86a Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Sat, 10 Sep 2022 14:17:32 +1000
Subject: Cleanup: format, spelling

---
 intern/cycles/kernel/osl/closures.cpp |  2 +-
 intern/cycles/kernel/osl/shader.cpp   | 13 +++++--------
 intern/cycles/kernel/osl/types.h      |  1 -
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'intern')

diff --git a/intern/cycles/kernel/osl/closures.cpp b/intern/cycles/kernel/osl/closures.cpp
index 604d672063b..45ecd5132ef 100644
--- a/intern/cycles/kernel/osl/closures.cpp
+++ b/intern/cycles/kernel/osl/closures.cpp
@@ -20,8 +20,8 @@
 #include "kernel/device/cpu/compat.h"
 #include "kernel/device/cpu/globals.h"
 
-#include "kernel/osl/types.h"
 #include "kernel/osl/closures_setup.h"
+#include "kernel/osl/types.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/kernel/osl/shader.cpp b/intern/cycles/kernel/osl/shader.cpp
index 83fdfab1217..c3079e8af4d 100644
--- a/intern/cycles/kernel/osl/shader.cpp
+++ b/intern/cycles/kernel/osl/shader.cpp
@@ -150,7 +150,8 @@ static void flatten_surface_closure_tree(const KernelGlobalsCPU *kg,
   switch (closure->id) {
     case OSL::ClosureColor::MUL: {
       OSL::ClosureMul *mul = (OSL::ClosureMul *)closure;
-      flatten_surface_closure_tree(kg, sd, path_flag, mul->closure, TO_FLOAT3(mul->weight) * weight);
+      flatten_surface_closure_tree(
+          kg, sd, path_flag, mul->closure, TO_FLOAT3(mul->weight) * weight);
       break;
     }
     case OSL::ClosureColor::ADD: {
@@ -161,14 +162,10 @@ static void flatten_surface_closure_tree(const KernelGlobalsCPU *kg,
     }
 #define OSL_CLOSURE_STRUCT_BEGIN(Upper, lower) \
   case OSL_CLOSURE_##Upper##_ID: { \
-    const OSL::ClosureComponent *comp = \
-        reinterpret_cast<const OSL::ClosureComponent *>(closure); \
+    const OSL::ClosureComponent *comp = reinterpret_cast<const OSL::ClosureComponent *>(closure); \
     weight *= TO_FLOAT3(comp->w); \
-    osl_closure_##lower##_setup(kg, \
-                                sd, \
-                                path_flag, \
-                                weight, \
-                                reinterpret_cast<const Upper##Closure *>(comp + 1)); \
+    osl_closure_##lower##_setup( \
+        kg, sd, path_flag, weight, reinterpret_cast<const Upper##Closure *>(comp + 1)); \
     break; \
   }
 #include "closures_template.h"
diff --git a/intern/cycles/kernel/osl/types.h b/intern/cycles/kernel/osl/types.h
index 14feb16aad4..46e06114360 100644
--- a/intern/cycles/kernel/osl/types.h
+++ b/intern/cycles/kernel/osl/types.h
@@ -17,5 +17,4 @@ enum ClosureTypeOSL {
 #include "closures_template.h"
 };
 
-
 CCL_NAMESPACE_END
-- 
cgit v1.2.3