diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-10 07:17:32 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-09-10 07:17:32 +0300 |
| commit | eae081f8fd571cc7bed79acf356efc14f276a86a (patch) | |
| tree | f444ccea7c9d1d846246b093b7e40af6b83c0999 | |
| parent | ef3c49de8186278d57d0319ab4bf4fe923b7016d (diff) | |
Cleanup: format, spelling
| -rw-r--r-- | intern/cycles/kernel/osl/closures.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/shader.cpp | 13 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/types.h | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_outliner.py | 1 |
4 files changed, 7 insertions, 10 deletions
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" |