Commit: 731c3efd97bd84f3cda4d8bb3e0dea58b12951e7 Author: Campbell Barton Date: Mon Feb 6 12:32:45 2023 +1100 Branches: master https://developer.blender.org/rB731c3efd97bd84f3cda4d8bb3e0dea58b12951e7
Cleanup: format =================================================================== M intern/cycles/kernel/closure/bsdf.h M intern/cycles/kernel/closure/bsdf_util.h M source/blender/blenkernel/BKE_mesh_legacy_convert.h M source/blender/blenkernel/intern/nla_test.cc M source/blender/bmesh/intern/bmesh_construct.h =================================================================== diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h index 28829262ac9..e7754bde7c5 100644 --- a/intern/cycles/kernel/closure/bsdf.h +++ b/intern/cycles/kernel/closure/bsdf.h @@ -661,7 +661,8 @@ ccl_device void bsdf_blur(KernelGlobals kg, ccl_private ShaderClosure *sc, float #endif } -ccl_device_inline Spectrum bsdf_albedo(ccl_private const ShaderData *sd, ccl_private const ShaderClosure *sc) +ccl_device_inline Spectrum bsdf_albedo(ccl_private const ShaderData *sd, + ccl_private const ShaderClosure *sc) { Spectrum albedo = sc->weight; /* Some closures include additional components such as Fresnel terms that cause their albedo to diff --git a/intern/cycles/kernel/closure/bsdf_util.h b/intern/cycles/kernel/closure/bsdf_util.h index 5d7fd989ef2..ee992375914 100644 --- a/intern/cycles/kernel/closure/bsdf_util.h +++ b/intern/cycles/kernel/closure/bsdf_util.h @@ -90,8 +90,10 @@ ccl_device float schlick_fresnel(float u) } /* Calculate the fresnel color, which is a blend between white and the F0 color */ -ccl_device_forceinline Spectrum -interpolate_fresnel_color(float3 L, float3 H, float ior, Spectrum F0) +ccl_device_forceinline Spectrum interpolate_fresnel_color(float3 L, + float3 H, + float ior, + Spectrum F0) { /* Compute the real Fresnel term and remap it from real_F0..1 to F0..1. * The reason why we use this remapping instead of directly doing the diff --git a/source/blender/blenkernel/BKE_mesh_legacy_convert.h b/source/blender/blenkernel/BKE_mesh_legacy_convert.h index ee33d535179..087716706e1 100644 --- a/source/blender/blenkernel/BKE_mesh_legacy_convert.h +++ b/source/blender/blenkernel/BKE_mesh_legacy_convert.h @@ -36,7 +36,7 @@ void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh); * Move face sets to the legacy type from a generic type. */ void BKE_mesh_legacy_face_set_from_generic( - blender::MutableSpan<CustomDataLayer> poly_layers_to_write); + blender::MutableSpan<CustomDataLayer> poly_layers_to_write); /** * Copy face sets to the generic data type from the legacy type. */ diff --git a/source/blender/blenkernel/intern/nla_test.cc b/source/blender/blenkernel/intern/nla_test.cc index b138baaaea0..ef9ca83e25f 100644 --- a/source/blender/blenkernel/intern/nla_test.cc +++ b/source/blender/blenkernel/intern/nla_test.cc @@ -50,7 +50,7 @@ TEST(nla_strip, BKE_nlastrips_add_strip) NlaStrip strip2{}; strip2.start = 5; strip2.end = 10; - + /* can't add a null NLA strip to an NLA Track. */ EXPECT_FALSE(BKE_nlastrips_add_strip(&strips, NULL)); diff --git a/source/blender/bmesh/intern/bmesh_construct.h b/source/blender/bmesh/intern/bmesh_construct.h index 0b85abdaa92..036605e6b67 100644 --- a/source/blender/bmesh/intern/bmesh_construct.h +++ b/source/blender/bmesh/intern/bmesh_construct.h @@ -170,7 +170,6 @@ void BM_mesh_copy_init_customdata_all_layers(BMesh *bm_dst, const struct BMAllocTemplate *allocsize); BMesh *BM_mesh_copy(BMesh *bm_old); - #ifdef __cplusplus } #endif _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs