[Bf-blender-cvs] [72f388c85e5] master: Cleanup: format
Campbell Barton
noreply at git.blender.org
Wed Aug 10 08:24:02 CEST 2022
Commit: 72f388c85e5f6d819e9e9f44b3ef29a8ecce3c62
Author: Campbell Barton
Date: Wed Aug 10 16:15:45 2022 +1000
Branches: master
https://developer.blender.org/rB72f388c85e5f6d819e9e9f44b3ef29a8ecce3c62
Cleanup: format
===================================================================
M intern/cycles/kernel/closure/bssrdf.h
M source/blender/draw/intern/draw_manager_data.c
M source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
===================================================================
diff --git a/intern/cycles/kernel/closure/bssrdf.h b/intern/cycles/kernel/closure/bssrdf.h
index 47df0c5533a..cdd4d128c1f 100644
--- a/intern/cycles/kernel/closure/bssrdf.h
+++ b/intern/cycles/kernel/closure/bssrdf.h
@@ -260,8 +260,7 @@ ccl_device_forceinline float bssrdf_pdf(const Spectrum radius, float r)
/* Setup */
-ccl_device_inline ccl_private Bssrdf *bssrdf_alloc(ccl_private ShaderData *sd,
- Spectrum weight)
+ccl_device_inline ccl_private Bssrdf *bssrdf_alloc(ccl_private ShaderData *sd, Spectrum weight)
{
ccl_private Bssrdf *bssrdf = (ccl_private Bssrdf *)closure_alloc(
sd, sizeof(Bssrdf), CLOSURE_NONE_ID, weight);
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 2f6090b22c4..5d8537e0f19 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -662,7 +662,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
drw_call_calc_orco(ob, ob_infos->orcotexfac);
/* Random float value. */
uint random = (DST.dupli_source) ?
- DST.dupli_source->random_id :
+ DST.dupli_source->random_id :
/* TODO(fclem): this is rather costly to do at runtime. Maybe we can
* put it in ob->runtime and make depsgraph ensure it is up to date. */
BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
index cf29c752257..a6c67cac916 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
@@ -221,7 +221,7 @@ BLI_NOINLINE static void update_elimination_mask_based_on_density_factors(
const float v2_density_factor = std::max(0.0f, density_factors[v2_loop]);
const float probability = v0_density_factor * bary_coord.x + v1_density_factor * bary_coord.y +
- v2_density_factor * bary_coord.z;
+ v2_density_factor * bary_coord.z;
const float hash = noise::hash_float_to_float(bary_coord);
if (hash > probability) {
More information about the Bf-blender-cvs
mailing list