[Bf-blender-cvs] [eae081f8fd5] master: Cleanup: format, spelling

[Campbell Barton]

Commit: eae081f8fd571cc7bed79acf356efc14f276a86a
Author: Campbell Barton
Date:   Sat Sep 10 14:17:32 2022 +1000
Branches: master
https://developer.blender.org/rBeae081f8fd571cc7bed79acf356efc14f276a86a

Cleanup: format, spelling

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

M	intern/cycles/kernel/osl/closures.cpp
M	intern/cycles/kernel/osl/shader.cpp
M	intern/cycles/kernel/osl/types.h
M	release/scripts/startup/bl_ui/space_outliner.py

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

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
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 5c488748db8..2b60158e3ae 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -331,6 +331,7 @@ def has_selected_ids_in_context(context):
 
     return False
 
+
 class OUTLINER_MT_asset(Menu):
     bl_label = "Assets"