diff options
| author | Campbell Barton <campbell@blender.org> | 2022-08-10 09:15:45 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-08-10 09:15:45 +0300 |
| commit | 72f388c85e5f6d819e9e9f44b3ef29a8ecce3c62 (patch) | |
| tree | 52cde14a43dcc8451ee78cedc6bde3aa4ba37af5 | |
| parent | 39f706a76c1db12e4d6e9f89bc9ed0a522ec2562 (diff) | |
Cleanup: format
| -rw-r--r-- | intern/cycles/kernel/closure/bssrdf.h | 3 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc | 2 |
3 files changed, 3 insertions, 4 deletions
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) { |